From 92392b21f2003e76a309d81b12ace2839d4783f9 Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Fri, 20 Dec 2013 18:13:05 +0900 Subject: [PATCH] Fix an NPE Change-Id: I6307c1545d9d48cdea66d08f8efc1b7fbb08ee42 --- .../inputmethod/latin/settings/SettingsValues.java | 8 ++++++-- 1 file 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.