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

Commit 278367f1 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Fix crash when no StatusBarView" into oc-dr1-dev am: c424b229 

am: bd06bad5

Change-Id: Ied19e5d1bd98c57634c336f3d930b2789bc70738
parents eeb99728 bd06bad5

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -1023,6 +1023,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
                    mStatusBarView.setBar(this);

                    mStatusBarView.setBar(this);

                    mStatusBarView.setPanel(mNotificationPanel);

                    mStatusBarView.setPanel(mNotificationPanel);

                    mStatusBarView.setScrimController(mScrimController);

                    mStatusBarView.setScrimController(mScrimController);

                    mStatusBarView.setBouncerShowing(mBouncerShowing);

                    setAreThereNotifications();

                    setAreThereNotifications();

                    checkBarModes();

                    checkBarModes();

                }).getFragmentManager()

                }).getFragmentManager()
@@ -5107,7 +5108,7 @@ public class StatusBar extends SystemUI implements DemoMode, 




    public void setBouncerShowing(boolean bouncerShowing) {

    public void setBouncerShowing(boolean bouncerShowing) {

        mBouncerShowing = bouncerShowing;

        mBouncerShowing = bouncerShowing;

        mStatusBarView.setBouncerShowing(bouncerShowing);

        if (mStatusBarView != null) mStatusBarView.setBouncerShowing(bouncerShowing);

        recomputeDisableFlags(true /* animate */);

        recomputeDisableFlags(true /* animate */);

    }

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -67,6 +67,7 @@ import com.android.keyguard.KeyguardHostView.OnDismissAction; 
import com.android.systemui.SysuiTestCase;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.recents.misc.SystemServicesProxy;

import com.android.systemui.recents.misc.SystemServicesProxy;

import com.android.systemui.statusbar.ActivatableNotificationView;

import com.android.systemui.statusbar.ActivatableNotificationView;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.KeyguardIndicationController;

import com.android.systemui.statusbar.KeyguardIndicationController;

import com.android.systemui.statusbar.NotificationData;

import com.android.systemui.statusbar.NotificationData;

import com.android.systemui.statusbar.NotificationData.Entry;

import com.android.systemui.statusbar.NotificationData.Entry;
@@ -155,6 +156,12 @@ public class StatusBarTest extends SysuiTestCase { 
        });

        });

    }

    }





    @Test

    public void testSetBouncerShowing_noCrash() {

        mStatusBar.mCommandQueue = mock(CommandQueue.class);

        mStatusBar.setBouncerShowing(true);

    }



    @Test

    @Test

    public void executeRunnableDismissingKeyguard_nullRunnable_showingAndOccluded() {

    public void executeRunnableDismissingKeyguard_nullRunnable_showingAndOccluded() {

        when(mStatusBarKeyguardViewManager.isShowing()).thenReturn(true);

        when(mStatusBarKeyguardViewManager.isShowing()).thenReturn(true);