From 5ecf80ceb8f058a824868928ea57444a8e1d682f Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Thu, 6 Jul 2017 15:28:17 -0400 Subject: [PATCH] Fix crash when no StatusBarView Test: runtest systemui Change-Id: Ia0a4a97f554e0b9d6e41c295e8e07d278f8ad248 Fixes: 63260821 --- .../src/com/android/systemui/statusbar/phone/StatusBar.java | 3 ++- .../src/com/android/systemui/statusbar/phone/StatusBarTest.java | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index f6fab4428e89..1f518a18ce50 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -1022,6 +1022,7 @@ public class StatusBar extends SystemUI implements DemoMode, mStatusBarView.setBar(this); mStatusBarView.setPanel(mNotificationPanel); mStatusBarView.setScrimController(mScrimController); + mStatusBarView.setBouncerShowing(mBouncerShowing); setAreThereNotifications(); checkBarModes(); }).getFragmentManager() @@ -5093,7 +5094,7 @@ public class StatusBar extends SystemUI implements DemoMode, public void setBouncerShowing(boolean bouncerShowing) { mBouncerShowing = bouncerShowing; - mStatusBarView.setBouncerShowing(bouncerShowing); + if (mStatusBarView != null) mStatusBarView.setBouncerShowing(bouncerShowing); recomputeDisableFlags(true /* animate */); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java index 17ca92458bcf..8a4983c330a2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java @@ -67,6 +67,7 @@ import com.android.keyguard.KeyguardHostView.OnDismissAction; import com.android.systemui.SysuiTestCase; import com.android.systemui.recents.misc.SystemServicesProxy; import com.android.systemui.statusbar.ActivatableNotificationView; +import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.KeyguardIndicationController; import com.android.systemui.statusbar.NotificationData; import com.android.systemui.statusbar.NotificationData.Entry; @@ -156,6 +157,12 @@ public class StatusBarTest extends SysuiTestCase { } @Test + public void testSetBouncerShowing_noCrash() { + mStatusBar.mCommandQueue = mock(CommandQueue.class); + mStatusBar.setBouncerShowing(true); + } + + @Test public void executeRunnableDismissingKeyguard_nullRunnable_showingAndOccluded() { when(mStatusBarKeyguardViewManager.isShowing()).thenReturn(true); when(mStatusBarKeyguardViewManager.isOccluded()).thenReturn(true); -- 2.11.0