diff options
| author | Satoshi Kataoka <satok@google.com> | 2013-04-17 20:40:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-17 20:40:25 -0700 |
| commit | 5faf1985af14d717de924530fbd78a691a732f58 (patch) | |
| tree | 809bac8a3ea0e6c3f281b3f0d37469be334dedf2 /services/java/com/android/server/InputMethodManagerService.java | |
| parent | a6e8ebb12f2d451236fc354778d2a916ed2fb0ef (diff) | |
| parent | 3e3a7b3b1ed641dfa7c321f48bd228c59dc3c180 (diff) | |
| download | frameworks_base-5faf1985af14d717de924530fbd78a691a732f58.zip frameworks_base-5faf1985af14d717de924530fbd78a691a732f58.tar.gz frameworks_base-5faf1985af14d717de924530fbd78a691a732f58.tar.bz2 | |
am 3e3a7b3b: am f024e7ac: Merge "Fix possible NPE" into jb-mr2-dev
* commit '3e3a7b3b1ed641dfa7c321f48bd228c59dc3c180':
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 d19433e..8315ac4 100644 --- a/services/java/com/android/server/InputMethodManagerService.java +++ b/services/java/com/android/server/InputMethodManagerService.java @@ -1600,7 +1600,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, |