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

Commit 3b67c0bd authored by Griff Hazen's avatar Griff Hazen Committed by Android (Google) Code Review
Browse files

Merge "Fix a status bar NPE in InputMethodManagerService" into nyc-dev

parents b63188de 6090c265

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

+4 −2
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
    // Ongoing notification

    private NotificationManager mNotificationManager;

    private KeyguardManager mKeyguardManager;

    private StatusBarManagerService mStatusBar;

    private @Nullable StatusBarManagerService mStatusBar;

    private Notification.Builder mImeSwitcherNotification;

    private PendingIntent mImeSwitchPendingIntent;

    private boolean mShowOngoingImeSwitcherForPhones;
@@ -1070,7 +1070,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
                mKeyguardManager = mContext.getSystemService(KeyguardManager.class);

                mNotificationManager = mContext.getSystemService(NotificationManager.class);

                mStatusBar = statusBar;

                statusBar.setIconVisibility(mSlotIme, false);

                if (mStatusBar != null) {

                    mStatusBar.setIconVisibility(mSlotIme, false);

                }

                updateSystemUiLocked(mCurToken, mImeWindowVis, mBackDisposition);

                mShowOngoingImeSwitcherForPhones = mRes.getBoolean(

                        com.android.internal.R.bool.show_ongoing_ime_switcher);