| commit | 7987a3172b0502ea70a26d80e7cd16ca7e460035 | [log] [tgz] |
|---|---|---|
| author | Satoshi Kataoka <satok@google.com> | Wed Apr 17 18:59:33 2013 +0900 |
| committer | Satoshi Kataoka <satok@google.com> | Wed Apr 17 18:59:33 2013 +0900 |
| tree | f1a3ae6006d75c20668f76900b3f4e24b603e9c0 | |
| parent | 83d90b200babe43d5e91cef1bbcf0b224f48e16d [diff] [blame] |
Fix possible NPE Bug: 8517083 Change-Id: Iea6bdcb0e39ee951b7f90f41cd3350bd1c7c5f71
diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index a28c387..f872cc3 100644 --- a/services/java/com/android/server/InputMethodManagerService.java +++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -1595,7 +1595,7 @@ ApplicationInfo ai = mIPackageManager.getApplicationInfo(imm.getPackageName(), PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS, mSettings.getCurrentUserId()); - if (ai.enabledSetting + if (ai != null && ai.enabledSetting == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED) { mIPackageManager.setApplicationEnabledSetting(imm.getPackageName(), PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,