diff options
| author | Satoshi Kataoka <satok@google.com> | 2013-04-17 20:36:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-17 20:36:12 -0700 |
| commit | 3e3a7b3b1ed641dfa7c321f48bd228c59dc3c180 (patch) | |
| tree | 7bcb8c0e8d8367eddf966677bca7b1cdefc15d39 /services/java/com/android/server/InputMethodManagerService.java | |
| parent | fb4e1c21eddf07fad7b36ac5e19dd2d479e71c5c (diff) | |
| parent | f024e7ac44e00ea560f547b4e5d67645a2e6c9b4 (diff) | |
| download | frameworks_base-3e3a7b3b1ed641dfa7c321f48bd228c59dc3c180.zip frameworks_base-3e3a7b3b1ed641dfa7c321f48bd228c59dc3c180.tar.gz frameworks_base-3e3a7b3b1ed641dfa7c321f48bd228c59dc3c180.tar.bz2 | |
am f024e7ac: Merge "Fix possible NPE" into jb-mr2-dev
* commit 'f024e7ac44e00ea560f547b4e5d67645a2e6c9b4':
Fix possible NPE
Diffstat (limited to 'services/java/com/android/server/InputMethodManagerService.java')
| -rw-r--r-- | services/java/com/android/server/InputMethodManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 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, |