Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f024e7ac: Merge "Fix possible NPE" into jb-mr2-dev

Browse Source 
* commit 'f024e7ac44e00ea560f547b4e5d67645a2e6c9b4':
  Fix possible NPE
This commit is contained in:
Satoshi Kataoka
2013-04-17 20:36:12 -07:00
committed by Android Git Automerger
parent fb4e1c21ed f024e7ac44
commit 3e3a7b3b1e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/InputMethodManagerService.java
View File

@@ -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,