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

Commit f024e7ac authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android (Google) Code Review
Browse files

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

parents 25b49734 7987a317

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1595,7 +1595,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
                    ApplicationInfo ai = mIPackageManager.getApplicationInfo(imm.getPackageName(),

                    ApplicationInfo ai = mIPackageManager.getApplicationInfo(imm.getPackageName(),

                            PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS,

                            PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS,

                            mSettings.getCurrentUserId());

                            mSettings.getCurrentUserId());

                    if (ai.enabledSetting

                    if (ai != null && ai.enabledSetting

                            == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED) {

                            == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED) {

                        mIPackageManager.setApplicationEnabledSetting(imm.getPackageName(),

                        mIPackageManager.setApplicationEnabledSetting(imm.getPackageName(),

                                PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,

                                PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,