From 6090c265e5703601e197b41c3caa49749b510411 Mon Sep 17 00:00:00 2001 From: Griff Hazen Date: Fri, 25 Mar 2016 08:11:24 -0700 Subject: Fix a status bar NPE in InputMethodManagerService Change-Id: I27f43acd7fd46b7c4f12c6c860b98ebf55335e51 --- .../core/java/com/android/server/InputMethodManagerService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java index 898d5b73b8d6..e04248303c20 100644 --- a/services/core/java/com/android/server/InputMethodManagerService.java +++ b/services/core/java/com/android/server/InputMethodManagerService.java @@ -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); -- cgit v1.2.3-59-g8ed1b