diff options
| author |   Jean Chalard <jchalard@google.com> | 2013-12-20 09:14:55 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2013-12-20 09:14:56 +0000 |
| commit | a22a63f3b1e0f5ef07d7b22eba5e5e16e002be90 (patch) | |
| tree | 08495dde4a95df7772fac6763efa965262fbe368 /java/src | |
| parent | f405c58c091b3ac9892e2811550d586aa5f65492 (diff) | |
| parent | 92392b21f2003e76a309d81b12ace2839d4783f9 (diff) | |
| download | latinime-a22a63f3b1e0f5ef07d7b22eba5e5e16e002be90.tar.gz latinime-a22a63f3b1e0f5ef07d7b22eba5e5e16e002be90.tar.xz latinime-a22a63f3b1e0f5ef07d7b22eba5e5e16e002be90.zip | |
Merge "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. |