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

Browse Source 
Change-Id: Icdeaafe85fa03ed0ee03379bcb41995be18d46dd
This commit is contained in:
Julia Reynolds
2020-03-30 20:39:02 +00:00
committed by Automerger Merge Worker
parent acbf2b36e4 6d30804cec
commit 8fcac244ad
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; return false;
} }
mChannel.setDemoted(false); mChannel.setDemoted(false);
mChannel.setBypassDnd(false);
saveChannel(); saveChannel();
if (mHostFragment != null) { 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); NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_DEFAULT);
channel.setConversationId("a", "a"); channel.setConversationId("a", "a");
channel.setDemoted(true); channel.setDemoted(true);
channel.setBypassDnd(true);
mController.onResume(appRow, channel, null, null, null, null); mController.onResume(appRow, channel, null, null, null, null);
Preference pref = mock(Preference.class); Preference pref = mock(Preference.class);
@@ -121,6 +122,7 @@ public class ConversationPromotePreferenceControllerTest {
verify(mBackend).updateChannel(eq(null), anyInt(), captor.capture()); verify(mBackend).updateChannel(eq(null), anyInt(), captor.capture());
assertFalse(captor.getValue().isDemoted()); assertFalse(captor.getValue().isDemoted());
assertFalse(captor.getValue().canBypassDnd());
verify(mFragment).getActivity(); verify(mFragment).getActivity();
} }