aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorJatin Matani <jatinm@google.com>2015-03-24 19:57:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-24 19:57:08 +0000
commit3b0c2eb09f24d86df79b99f45ef95fe8b8b63b94 (patch)
treed9a1748ca7d00a4703ef64393bca57926507fff8 /java/src
parenta8b14a4fdd544d20c08e9cae8b8a094f248b1728 (diff)
parent2fb8e5eecf0b472c00c40ab01d7bae81bdd4459f (diff)
downloadlatinime-3b0c2eb09f24d86df79b99f45ef95fe8b8b63b94.tar.gz
latinime-3b0c2eb09f24d86df79b99f45ef95fe8b8b63b94.tar.xz
latinime-3b0c2eb09f24d86df79b99f45ef95fe8b8b63b94.zip
Merge "Avoid NPE when logging the entry point to Settings"
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