nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am a22a63f3: Merge "Fix an NPE" 

* commit 'a22a63f3b1e0f5ef07d7b22eba5e5e16e002be90':
  Fix an NPE
main
Jean Chalard 2013-12-20 01:43:26 -08:00 committed by Android Git Automerger
parent 516d1d4eff a22a63f3b1
commit ca99631610
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java/src/com/android/inputmethod/latin/settings/SettingsValues.java
View File

@ -307,11 +307,15 @@ public final class SettingsValues {
} }
public boolean isBeforeJellyBean() { 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() { 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. // Helper functions to create member values.