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

Merge "Fix possible NPE" into jb-mr2-dev

Browse Source
This commit is contained in:
Satoshi Kataoka
2013-04-18 03:33:39 +00:00
committed by Android (Google) Code Review
parent 25b49734ca 7987a3172b
commit f024e7ac44
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,