Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7c12297 authored by Flavio Fiszman's avatar Flavio Fiszman Committed by Android (Google) Code Review
Browse files

Merge "Get rid of unnecessary noManSimulation function."

parents b1c9ecf6 88960fff
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -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,
+0 −6
Original line number Diff line number Diff line
@@ -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) {