summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Selim Cinek <cinek@google.com> 2019-08-02 11:44:03 -0700
committer android-build-merger <android-build-merger@google.com> 2019-08-02 11:44:03 -0700
commita39819b8d709db90d94d174cbfe2f29c9c555fd8 (patch)
tree5d6e41a9250364f0675189a6459545b3ee061a90
parent99a32a153a5b7711cfde72c29ee489688b7988ea (diff)
parentcab5f56182d2b3e1f059c1cdad39999adebf9c05 (diff)
Merge "Fixes breaking test" into qt-r1-dev am: 4c1435a8eb
am: cab5f56182 Change-Id: Ib4fc2d7cd079d6a45b606dbe121e1706c1c9b9d9
-rw-r--r--packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java
index 9ecb8d5c3126..c851c915d655 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java
@@ -137,7 +137,7 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase {
mDependency.injectTestDependency(
NotificationBlockingHelperManager.class,
mBlockingHelperManager);
- mDependency.injectTestDependency(StatusBarStateController.class, mBarState);
+ mDependency.injectTestDependency(SysuiStatusBarStateController.class, mBarState);
mDependency.injectTestDependency(MetricsLogger.class, mMetricsLogger);
mDependency.injectTestDependency(NotificationRemoteInputManager.class,
mRemoteInputManager);
@@ -163,7 +163,7 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase {
mock(DynamicPrivacyController.class),
mock(ConfigurationController.class),
mock(ActivityStarterDelegate.class),
- mock(StatusBarStateController.class),
+ mock(SysuiStatusBarStateController.class),
mHeadsUpManager,
mKeyguardBypassController);
mStackScroller = spy(mStackScrollerInternal);