diff options
| author |   Jatin Matani <jatinm@google.com> | 2015-03-24 20:02:45 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2015-03-24 20:02:45 +0000 |
| commit | 9393497cf5c30708d7fe7591ded5a72ee45071f6 (patch) | |
| tree | 6fbbcd7f66613876cd75fcd86b28adc9d155e87d /java/src | |
| parent | 949fadc9da863526a7ca61de08e6d78660aac68e (diff) | |
| parent | 3b0c2eb09f24d86df79b99f45ef95fe8b8b63b94 (diff) | |
| download | latinime-9393497cf5c30708d7fe7591ded5a72ee45071f6.tar.gz latinime-9393497cf5c30708d7fe7591ded5a72ee45071f6.tar.xz latinime-9393497cf5c30708d7fe7591ded5a72ee45071f6.zip | |
am 3b0c2eb0: Merge "Avoid NPE when logging the entry point to Settings"
* commit '3b0c2eb09f24d86df79b99f45ef95fe8b8b63b94':
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.java | 2 |
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 |