PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528 am: 6d30804cec am: 639b6f89ea

Browse Source 
Change-Id: I77c60b21d864ffb1dfac182a244895c9b59774fa
This commit is contained in:
Julia Reynolds
2020-03-30 20:51:15 +00:00
committed by Automerger Merge Worker
parent 5124fa67cc 639b6f89ea
commit 41874f9f73
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/notification/app/ConversationPromotePreferenceController.java
View File

@@ -66,6 +66,7 @@ public class ConversationPromotePreferenceController extends NotificationPrefere
return false;
}
mChannel.setDemoted(false);
mChannel.setBypassDnd(false);
saveChannel();
if (mHostFragment != null) {

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

@@ -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();
}