Merge "Fix NPE in NSSL test" into qt-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
c5e858a2c2
@@ -70,6 +70,7 @@ import com.android.systemui.statusbar.notification.row.FooterView;
|
||||
import com.android.systemui.statusbar.notification.row.NotificationBlockingHelperManager;
|
||||
import com.android.systemui.statusbar.phone.HeadsUpManagerPhone;
|
||||
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;
|
||||
private TestableNotificationEntryManager mEntryManager;
|
||||
@@ -162,6 +164,7 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase {
|
||||
mStackScroller.setHeadsUpManager(mHeadsUpManager);
|
||||
mStackScroller.setGroupManager(mGroupManager);
|
||||
mStackScroller.setEmptyShadeView(mEmptyShadeView);
|
||||
mStackScroller.setIconAreaController(mNotificationIconAreaController);
|
||||
|
||||
// Stub out functionality that isn't necessary to test.
|
||||
doNothing().when(mBar)
|
||||
|
||||
Reference in New Issue
Block a user