diff options
| author |   Jean Chalard <jchalard@google.com> | 2013-12-20 01:43:26 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-12-20 01:43:26 -0800 |
| commit | ca99631610283008bc42db35cd064faf21ec5399 (patch) | |
| tree | 08495dde4a95df7772fac6763efa965262fbe368 /java/src | |
| parent | 516d1d4eff9b792258b12c6b8d01c76ff27795cf (diff) | |
| parent | a22a63f3b1e0f5ef07d7b22eba5e5e16e002be90 (diff) | |
| download | latinime-ca99631610283008bc42db35cd064faf21ec5399.tar.gz latinime-ca99631610283008bc42db35cd064faf21ec5399.tar.xz latinime-ca99631610283008bc42db35cd064faf21ec5399.zip | |
am a22a63f3: Merge "Fix an NPE"
* commit 'a22a63f3b1e0f5ef07d7b22eba5e5e16e002be90':
Fix an NPE
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/SettingsValues.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java index f97e9e1fc..c0e8a0301 100644 --- a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java +++ b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java @@ -307,11 +307,15 @@ public final class SettingsValues { } public boolean isBeforeJellyBean() { - return mAppWorkarounds.get(null, TIMEOUT_TO_GET_TARGET_PACKAGE).isBeforeJellyBean(); + final AppWorkaroundsUtils appWorkaroundUtils + = mAppWorkarounds.get(null, TIMEOUT_TO_GET_TARGET_PACKAGE); + return null == appWorkaroundUtils ? false : appWorkaroundUtils.isBeforeJellyBean(); } public boolean isBrokenByRecorrection() { - return mAppWorkarounds.get(null, TIMEOUT_TO_GET_TARGET_PACKAGE).isBrokenByRecorrection(); + final AppWorkaroundsUtils appWorkaroundUtils + = mAppWorkarounds.get(null, TIMEOUT_TO_GET_TARGET_PACKAGE); + return null == appWorkaroundUtils ? null : appWorkaroundUtils.isBrokenByRecorrection(); } // Helper functions to create member values. |