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

Commit 6d30804c authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d5 

Change-Id: I3504ff5e96055ce63098d738f7390cb5c3c3569b
parents 2b541018 b3f2c0d5

src/com/android/settings/notification/app/ConversationPromotePreferenceController.java

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ public class ConversationPromotePreferenceController extends NotificationPrefere 
            return false;

        }

        mChannel.setDemoted(false);

        mChannel.setBypassDnd(false);

        saveChannel();



        if (mHostFragment != null) {

tests/robotests/src/com/android/settings/notification/app/ConversationPromotePreferenceControllerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ public class ConversationPromotePreferenceControllerTest { 
        NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_DEFAULT);

        channel.setConversationId("a", "a");

        channel.setDemoted(true);

        channel.setBypassDnd(true);

        mController.onResume(appRow, channel, null, null, null, null);



        Preference pref = mock(Preference.class);
@@ -121,6 +122,7 @@ public class ConversationPromotePreferenceControllerTest { 


        verify(mBackend).updateChannel(eq(null), anyInt(), captor.capture());

        assertFalse(captor.getValue().isDemoted());

        assertFalse(captor.getValue().canBypassDnd());



        verify(mFragment).getActivity();

    }