Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5faf1985 authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android Git Automerger
Browse files

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

* commit '3e3a7b3b':
  Fix possible NPE
parents a6e8ebb1 3e3a7b3b

services/java/com/android/server/InputMethodManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -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,