commit bac83940c151a7a33744469778ab443ed506f5ad
author Selim Cinek <cinek@google.com> Fri Aug 02 11:30:10 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 02 11:30:10 2019 -0700
tree 76bf5f37cc46cfa8b1da54dcb5f96e9f1e19a57e
parent 9e00da839004395878a2640b5750eca3e2aa3c78
parent 4c1435a8ebd29c8e672cc092ba1f71e800156b95

Merge "Fixes breaking test" into qt-r1-dev
am: 4c1435a8eb

Change-Id: Ied67a3823b917b7e64cdf80c09472a50de70a9fe

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

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 9ecb8d5..c851c91 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 @@
         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 @@
                 mock(DynamicPrivacyController.class),
                 mock(ConfigurationController.class),
                 mock(ActivityStarterDelegate.class),
-                mock(StatusBarStateController.class),
+                mock(SysuiStatusBarStateController.class),
                 mHeadsUpManager,
                 mKeyguardBypassController);
         mStackScroller = spy(mStackScrollerInternal);