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
google · Mar 15, 2016 · 09b47c3 · 09b47c3
1 parent 120d6a1
commit 09b47c3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...rc/com/google/android/inputmethod/japanese/userdictionary/UserDictionaryToolActivity.java b/...rc/com/google/android/inputmethod/japanese/userdictionary/UserDictionaryToolActivity.java
@@ -247,15 +247,15 @@ 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);
       return;
     }
 
     // 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
@@ -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.