commit 7901714521fa00aa51db48d7ee79df6e978a639e
author Alex Light <allight@google.com> Tue Nov 06 15:44:46 2018 -0800
committer android-build-merger <android-build-merger@google.com> Tue Nov 06 15:44:46 2018 -0800
tree 7dcc4107f413941bd06c429c25525b7e95bea840
parent f40eeb4a18678e782ce7e00b28c6b9617bf85c2c
parent 5bb1e8c9bc415d2be80524de2e43706e5c58d96a

Merge "Correct illegal mockito usage."
am: 5bb1e8c9bc

Change-Id: Ib8c6436b72d0cbb7133a9a2b0586f8263adf598e

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 c0bd7cc..3c3c8dd 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);
     }