aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorJatin Matani <jatinm@google.com>2015-03-24 12:20:23 -0700
committerJatin Matani <jatinm@google.com>2015-03-24 12:25:22 -0700
commit2fb8e5eecf0b472c00c40ab01d7bae81bdd4459f (patch)
tree8ed06b8c15c8b4fd9b470c1c86ff3ed5050618ab /java/src
parentcb27c4fe2e6958bbf0d9c77bb97ac7d6a941781d (diff)
downloadlatinime-2fb8e5eecf0b472c00c40ab01d7bae81bdd4459f.tar.gz
latinime-2fb8e5eecf0b472c00c40ab01d7bae81bdd4459f.tar.xz
latinime-2fb8e5eecf0b472c00c40ab01d7bae81bdd4459f.zip
Avoid NPE when logging the entry point to Settings
The populator class that serializes the proto uses a switch and throws an NPE. Bug:19911288 Change-Id: Id0fa371b3c64e706e14a13bb6e643406f94be035
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/settings/SettingsActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsActivity.java b/java/src/com/android/inputmethod/latin/settings/SettingsActivity.java
index dee4811c9..9975277e4 100644
--- a/java/src/com/android/inputmethod/latin/settings/SettingsActivity.java
+++ b/java/src/com/android/inputmethod/latin/settings/SettingsActivity.java
@@ -50,7 +50,7 @@ public final class SettingsActivity extends PreferenceActivity {
}
StatsUtils.onSettingsActivity(
intent.hasExtra(EXTRA_ENTRY_KEY) ? intent.getStringExtra(EXTRA_ENTRY_KEY)
- : intent.getStringExtra(EXTRA_ENTRY_VALUE_SYSTEM_SETTINGS));
+ : EXTRA_ENTRY_VALUE_SYSTEM_SETTINGS);
}
@Override