Merge "Get rid of unnecessary noManSimulation function."

2 files changed, 3 insertions, 8 deletions

diff --git a/packages/SystemUI/tests/src/com/android/systemui/people/widget/PeopleSpaceWidgetManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/people/widget/PeopleSpaceWidgetManagerTest.java
index 3e44fa4a9b2b..477fe6316399 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/people/widget/PeopleSpaceWidgetManagerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/people/widget/PeopleSpaceWidgetManagerTest.java
@@ -16,6 +16,7 @@
 
 package com.android.systemui.people.widget;
 
+import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
 import static android.app.NotificationManager.IMPORTANCE_HIGH;
 
 import static org.mockito.ArgumentMatchers.any;
@@ -164,7 +165,7 @@ public class PeopleSpaceWidgetManagerTest extends SysuiTestCase {
         when(mIAppWidgetService.getAppWidgetIds(any())).thenReturn(widgetIdsArray);
 
         NotificationChannel channel =
-                mNoMan.createNotificationChannel(TEST_CHANNEL_ID, TEST_CHANNEL_NAME);
+                new NotificationChannel(TEST_CHANNEL_ID, TEST_CHANNEL_NAME, IMPORTANCE_DEFAULT);
 
         mNoMan.issueChannelModification(TEST_PACKAGE_A,
                 UserHandle.getUserHandleForUid(0), channel, IMPORTANCE_HIGH);
@@ -181,7 +182,7 @@ public class PeopleSpaceWidgetManagerTest extends SysuiTestCase {
         when(mIAppWidgetService.getAppWidgetIds(any())).thenReturn(widgetIdsArray);
 
         NotificationChannel channel =
-                mNoMan.createNotificationChannel(TEST_CHANNEL_ID, TEST_CHANNEL_NAME);
+                new NotificationChannel(TEST_CHANNEL_ID, TEST_CHANNEL_NAME, IMPORTANCE_DEFAULT);
         channel.setConversationId(TEST_PARENT_CHANNEL_ID, TEST_CONVERSATION_ID);
 
         mNoMan.issueChannelModification(TEST_PACKAGE_A,
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NoManSimulator.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NoManSimulator.java
index 1bfe10c5263b..4507366e3073 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NoManSimulator.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NoManSimulator.java
@@ -16,8 +16,6 @@
 
 package com.android.systemui.statusbar.notification.collection;
 
-import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
-
 import static org.junit.Assert.assertNotNull;
 
 import android.app.NotificationChannel;
@@ -76,10 +74,6 @@ public class NoManSimulator {
         }
     }
 
-    public NotificationChannel createNotificationChannel(String id, String name) {
-        return new NotificationChannel(id, name, IMPORTANCE_DEFAULT);
-    }
-
     public void issueChannelModification(
             String pkg, UserHandle user, NotificationChannel channel, int modificationType) {
         for (NotificationHandler listener : mListeners) {