From 09b47c3b5a6418e745a809cc393a267e8a637740 Mon Sep 17 00:00:00 2001
From: Tsuyoshi Matsuzaki <matsuzakit@google.com>
Date: Tue, 15 Mar 2016 10:19:11 +0900
Subject: [PATCH] Fix NPE in UserDictionaryToolActivity.onPostResume

BUG=
TEST=
REF_BUG=27512091
REF_CL=117196133
REF_TIME=2016-03-15T10:19:11+09:00
REF_TIME_RAW=1458004751 +0900
---
 .../japanese/userdictionary/UserDictionaryToolActivity.java   | 4 ++--
 src/mozc_version_template.txt                                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/android/src/com/google/android/inputmethod/japanese/userdictionary/UserDictionaryToolActivity.java b/src/android/src/com/google/android/inputmethod/japanese/userdictionary/UserDictionaryToolActivity.java
index ea8e674c5..e7fbb63d3 100644
--- a/src/android/src/com/google/android/inputmethod/japanese/userdictionary/UserDictionaryToolActivity.java
+++ b/src/android/src/com/google/android/inputmethod/japanese/userdictionary/UserDictionaryToolActivity.java
@@ -247,7 +247,7 @@ private void handleImportData() {
       return;
     }
 
-    if (!importUri.getScheme().equals("file")) {
+    if (!"file".equals(importUri.getScheme())) {
       // Not a file.
       toastManager.showMessageShortly(
           R.string.user_dictionary_tool_error_import_source_invalid_scheme);
@@ -255,7 +255,7 @@ private void handleImportData() {
     }
 
     // Need to read data from the file.
-    if (getIntent().getType().equals("application/zip")) {
+    if ("application/zip".equals(getIntent().getType())) {
       handleZipImportData(importUri.getPath());
     } else {
       handleTextImportData(importUri.getPath());
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index c36d47387..207c8e4f7 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
 MAJOR=2
 MINOR=17
-BUILD=2531
+BUILD=2532
 REVISION=102
 # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
 # downloaded by NaCl Mozc.