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

Commit 1d5c9318 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Fix NPE in NSSL test" into qt-dev am: c5e858a2 

am: d4fd22c9

Change-Id: I254e89f31e2d6efe424a4ddc2ca6b2496976bc12
parents d81a53f2 d4fd22c9

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java

+3 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ import com.android.systemui.statusbar.notification.row.NotificationBlockingHelpe 
import com.android.systemui.statusbar.phone.HeadsUpManagerPhone;

import com.android.systemui.statusbar.phone.KeyguardBypassController;

import com.android.systemui.statusbar.phone.NotificationGroupManager;

import com.android.systemui.statusbar.phone.NotificationIconAreaController;

import com.android.systemui.statusbar.phone.ScrimController;

import com.android.systemui.statusbar.phone.ShadeController;

import com.android.systemui.statusbar.phone.StatusBar;
@@ -110,6 +111,7 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
    @Mock private NotificationData mNotificationData;

    @Mock private NotificationRemoteInputManager mRemoteInputManager;

    @Mock private RemoteInputController mRemoteInputController;

    @Mock private NotificationIconAreaController mNotificationIconAreaController;

    @Mock private MetricsLogger mMetricsLogger;

    @Mock private NotificationRoundnessManager mNotificationRoundnessManager;

    @Mock private KeyguardBypassController mKeyguardBypassController;
@@ -163,6 +165,7 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
        mStackScroller.setScrimController(mock(ScrimController.class));

        mStackScroller.setGroupManager(mGroupManager);

        mStackScroller.setEmptyShadeView(mEmptyShadeView);

        mStackScroller.setIconAreaController(mNotificationIconAreaController);



        // Stub out functionality that isn't necessary to test.

        doNothing().when(mBar)