Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't convert conversation senders to the wrong enum" into tm-qpr-dev am: b1d3498189

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22475902

Change-Id: I0bcd9818582db9e4dbf08a16cfd5ed9c8a8eb909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yuri Lin
2023-04-05 17:49:14 +00:00
committed by Automerger Merge Worker
parent 64205590d8 b1d3498189
commit 5c7b2aa90e
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/service/notification/ZenModeConfig.java
View File

@@ -1008,9 +1008,8 @@ public class ZenModeConfig implements Parcelable {
.allowAlarms(allowAlarms) .allowAlarms(allowAlarms)
.allowMedia(allowMedia) .allowMedia(allowMedia)
.allowSystem(allowSystem) .allowSystem(allowSystem)
.allowConversations(allowConversations .allowConversations(allowConversations ? allowConversationsFrom
? ZenModeConfig.getZenPolicySenders(allowConversationsFrom) : ZenPolicy.CONVERSATION_SENDERS_NONE);
: ZenPolicy.PEOPLE_TYPE_NONE);
if (suppressedVisualEffects == 0) { if (suppressedVisualEffects == 0) {
builder.showAllVisualEffects(); builder.showAllVisualEffects();
} else { } else {

12
services/tests/uiservicestests/src/com/android/server/notification/ZenModeConfigTest.java
View File

@@ -120,12 +120,20 @@ public class ZenModeConfigTest extends UiServiceTestCase {
.showLights(false) .showLights(false)
.showBadges(false) .showBadges(false)
.showInAmbientDisplay(false) .showInAmbientDisplay(false)
.allowCalls(ZenPolicy.PEOPLE_TYPE_CONTACTS)
.allowMessages(ZenPolicy.PEOPLE_TYPE_STARRED)
.allowConversations(ZenPolicy.CONVERSATION_SENDERS_NONE)
.build(); .build();
ZenModeConfig config = getMutedAllConfig(); ZenModeConfig config = getMutedAllConfig();
config.allowAlarms = true; config.allowAlarms = true;
config.allowReminders = true; config.allowReminders = true;
config.allowEvents = true; config.allowEvents = true;
config.allowCalls = true;
config.allowCallsFrom = Policy.PRIORITY_SENDERS_CONTACTS;
config.allowMessages = true;
config.allowMessagesFrom = Policy.PRIORITY_SENDERS_STARRED;
config.allowConversations = false;
config.suppressedVisualEffects |= Policy.SUPPRESSED_EFFECT_BADGE; config.suppressedVisualEffects |= Policy.SUPPRESSED_EFFECT_BADGE;
config.suppressedVisualEffects |= Policy.SUPPRESSED_EFFECT_LIGHTS; config.suppressedVisualEffects |= Policy.SUPPRESSED_EFFECT_LIGHTS;
config.suppressedVisualEffects |= Policy.SUPPRESSED_EFFECT_AMBIENT; config.suppressedVisualEffects |= Policy.SUPPRESSED_EFFECT_AMBIENT;
@@ -138,6 +146,10 @@ public class ZenModeConfigTest extends UiServiceTestCase {
assertEquals(expected.getPriorityCategoryEvents(), actual.getPriorityCategoryEvents()); assertEquals(expected.getPriorityCategoryEvents(), actual.getPriorityCategoryEvents());
assertEquals(expected.getVisualEffectLights(), actual.getVisualEffectLights()); assertEquals(expected.getVisualEffectLights(), actual.getVisualEffectLights());
assertEquals(expected.getVisualEffectAmbient(), actual.getVisualEffectAmbient()); assertEquals(expected.getVisualEffectAmbient(), actual.getVisualEffectAmbient());
assertEquals(expected.getPriorityConversationSenders(),
actual.getPriorityConversationSenders());
assertEquals(expected.getPriorityCallSenders(), actual.getPriorityCallSenders());
assertEquals(expected.getPriorityMessageSenders(), actual.getPriorityMessageSenders());
} }
@Test @Test