commit dfe6c07b96da7722fd7722e1f64e730a360d5075
author Alex Light <allight@google.com> Tue Nov 06 16:11:53 2018 -0800
committer android-build-merger <android-build-merger@google.com> Tue Nov 06 16:11:53 2018 -0800
tree 2832ce47bab5b08db77be1a951f4dfdf161404d2
parent e1219c73ef01f47eae989e41771b717fa5c7145e
parent 756d5ae29a8d1f96ff9296a4bb38219a4d39550b

Merge "Correct illegal mockito usage." am: 5bb1e8c9bc am: 7901714521
am: 756d5ae29a

Change-Id: Ibae90ae05b36129a34a358bb60ffd7ad23e3c4a4

services/tests/uiservicestests/src/com/android/server/notification/ZenModeFilteringTest.java

diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeFilteringTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeFilteringTest.java
index ae0e35b..4018eef 100644
--- a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeFilteringTest.java
+++ b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeFilteringTest.java
@@ -70,7 +70,8 @@
 
     private NotificationRecord getNotificationRecord(NotificationChannel c) {
         StatusBarNotification sbn = mock(StatusBarNotification.class);
-        when(sbn.getNotification()).thenReturn(mock(Notification.class));
+        Notification notification = mock(Notification.class);
+        when(sbn.getNotification()).thenReturn(notification);
         return new NotificationRecord(mContext, sbn, c);
     }