diff options
8 files changed, 27 insertions, 23 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 9afd4ef9be88..e5a9506b7123 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -40614,7 +40614,7 @@ package android.service.notification { method public int getPriorityCategoryReminders(); method public int getPriorityCategoryRepeatCallers(); method public int getPriorityCategorySystem(); - method @FlaggedApi("android.app.modes_api") public int getPriorityChannels(); + method @FlaggedApi("android.app.modes_api") public int getPriorityChannelsAllowed(); method public int getPriorityConversationSenders(); method public int getPriorityMessageSenders(); method public int getVisualEffectAmbient(); diff --git a/core/java/android/service/notification/ZenModeConfig.java b/core/java/android/service/notification/ZenModeConfig.java index 9895551a8672..9d19ef6bdc64 100644 --- a/core/java/android/service/notification/ZenModeConfig.java +++ b/core/java/android/service/notification/ZenModeConfig.java @@ -1053,7 +1053,7 @@ public class ZenModeConfig implements Parcelable { out); if (Flags.modesApi()) { - writeZenPolicyState(ALLOW_ATT_CHANNELS, policy.getPriorityChannels(), out); + writeZenPolicyState(ALLOW_ATT_CHANNELS, policy.getPriorityChannelsAllowed(), out); } } @@ -1381,7 +1381,7 @@ public class ZenModeConfig implements Parcelable { int state = defaultPolicy.state; if (Flags.modesApi()) { state = Policy.policyState(defaultPolicy.hasPriorityChannels(), - ZenPolicy.stateToBoolean(zenPolicy.getPriorityChannels(), + ZenPolicy.stateToBoolean(zenPolicy.getPriorityChannelsAllowed(), DEFAULT_ALLOW_PRIORITY_CHANNELS)); } diff --git a/core/java/android/service/notification/ZenPolicy.java b/core/java/android/service/notification/ZenPolicy.java index d8318a6bee7c..786d768bc55b 100644 --- a/core/java/android/service/notification/ZenPolicy.java +++ b/core/java/android/service/notification/ZenPolicy.java @@ -570,7 +570,7 @@ public final class ZenPolicy implements Parcelable { * with {@link NotificationChannel#canBypassDnd()} will be intercepted. */ @FlaggedApi(Flags.FLAG_MODES_API) - public @State int getPriorityChannels() { + public @State int getPriorityChannelsAllowed() { switch (mAllowChannels) { case CHANNEL_POLICY_PRIORITY: return STATE_ALLOW; @@ -1529,7 +1529,7 @@ public final class ZenPolicy implements Parcelable { proto.write(DNDPolicyProto.ALLOW_CONVERSATIONS_FROM, getPriorityConversationSenders()); if (Flags.modesApi()) { - proto.write(DNDPolicyProto.ALLOW_CHANNELS, getPriorityChannels()); + proto.write(DNDPolicyProto.ALLOW_CHANNELS, getPriorityChannelsAllowed()); } proto.flush(); diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java index c067fa068b12..923be56dd545 100644 --- a/services/core/java/com/android/server/notification/ZenModeHelper.java +++ b/services/core/java/com/android/server/notification/ZenModeHelper.java @@ -1183,7 +1183,7 @@ public class ZenModeHelper { != newPolicy.getPriorityConversationSenders()) { userModifiedFields |= ZenPolicy.FIELD_CONVERSATIONS; } - if (oldPolicy.getPriorityChannels() != newPolicy.getPriorityChannels()) { + if (oldPolicy.getPriorityChannelsAllowed() != newPolicy.getPriorityChannelsAllowed()) { userModifiedFields |= ZenPolicy.FIELD_ALLOW_CHANNELS; } if (oldPolicy.getPriorityCategoryReminders() diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ZenAdaptersTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ZenAdaptersTest.java index 0e20daf2c0f1..99d5a6d9118a 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ZenAdaptersTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ZenAdaptersTest.java @@ -143,12 +143,13 @@ public class ZenAdaptersTest extends UiServiceTestCase { Policy.policyState(false, true), 0); ZenPolicy zenPolicy = notificationPolicyToZenPolicy(policy); - assertThat(zenPolicy.getPriorityChannels()).isEqualTo(ZenPolicy.STATE_ALLOW); + assertThat(zenPolicy.getPriorityChannelsAllowed()).isEqualTo(ZenPolicy.STATE_ALLOW); Policy notAllowed = new Policy(0, 0, 0, 0, Policy.policyState(false, false), 0); ZenPolicy zenPolicyNotAllowed = notificationPolicyToZenPolicy(notAllowed); - assertThat(zenPolicyNotAllowed.getPriorityChannels()).isEqualTo(ZenPolicy.STATE_DISALLOW); + assertThat(zenPolicyNotAllowed.getPriorityChannelsAllowed()).isEqualTo( + ZenPolicy.STATE_DISALLOW); } @Test @@ -158,11 +159,12 @@ public class ZenAdaptersTest extends UiServiceTestCase { Policy.policyState(false, true), 0); ZenPolicy zenPolicy = notificationPolicyToZenPolicy(policy); - assertThat(zenPolicy.getPriorityChannels()).isEqualTo(ZenPolicy.STATE_UNSET); + assertThat(zenPolicy.getPriorityChannelsAllowed()).isEqualTo(ZenPolicy.STATE_UNSET); Policy notAllowed = new Policy(0, 0, 0, 0, Policy.policyState(false, false), 0); ZenPolicy zenPolicyNotAllowed = notificationPolicyToZenPolicy(notAllowed); - assertThat(zenPolicyNotAllowed.getPriorityChannels()).isEqualTo(ZenPolicy.STATE_UNSET); + assertThat(zenPolicyNotAllowed.getPriorityChannelsAllowed()).isEqualTo( + ZenPolicy.STATE_UNSET); } } diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeConfigTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeConfigTest.java index e523e79f6370..539bb37419f1 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeConfigTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeConfigTest.java @@ -284,7 +284,7 @@ public class ZenModeConfigTest extends UiServiceTestCase { actual.getPriorityConversationSenders()); assertEquals(expected.getPriorityCallSenders(), actual.getPriorityCallSenders()); assertEquals(expected.getPriorityMessageSenders(), actual.getPriorityMessageSenders()); - assertEquals(expected.getPriorityChannels(), actual.getPriorityChannels()); + assertEquals(expected.getPriorityChannelsAllowed(), actual.getPriorityChannelsAllowed()); } @Test @@ -716,7 +716,7 @@ public class ZenModeConfigTest extends UiServiceTestCase { assertEquals(policy.getPriorityCategorySystem(), fromXml.getPriorityCategorySystem()); assertEquals(policy.getPriorityCategoryReminders(), fromXml.getPriorityCategoryReminders()); assertEquals(policy.getPriorityCategoryEvents(), fromXml.getPriorityCategoryEvents()); - assertEquals(policy.getPriorityChannels(), fromXml.getPriorityChannels()); + assertEquals(policy.getPriorityChannelsAllowed(), fromXml.getPriorityChannelsAllowed()); assertEquals(policy.getVisualEffectFullScreenIntent(), fromXml.getVisualEffectFullScreenIntent()); diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java index 25ad7dbac30c..227265aa0a5b 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java @@ -4075,7 +4075,8 @@ public class ZenModeHelperTest extends UiServiceTestCase { // UPDATE_ORIGIN_USER should change the bitmask and change the values. assertThat(rule.getInterruptionFilter()).isEqualTo(INTERRUPTION_FILTER_PRIORITY); - assertThat(rule.getZenPolicy().getPriorityChannels()).isEqualTo(ZenPolicy.STATE_DISALLOW); + assertThat(rule.getZenPolicy().getPriorityChannelsAllowed()).isEqualTo( + ZenPolicy.STATE_DISALLOW); assertThat(rule.getDeviceEffects().shouldDisplayGrayscale()).isTrue(); @@ -4339,7 +4340,8 @@ public class ZenModeHelperTest extends UiServiceTestCase { // New ZenPolicy differs from the default config assertThat(rule.getZenPolicy()).isNotNull(); - assertThat(rule.getZenPolicy().getPriorityChannels()).isEqualTo(ZenPolicy.STATE_DISALLOW); + assertThat(rule.getZenPolicy().getPriorityChannelsAllowed()).isEqualTo( + ZenPolicy.STATE_DISALLOW); ZenRule storedRule = mZenModeHelper.mConfig.automaticRules.get(ruleId); assertThat(storedRule.canBeUpdatedByApp()).isFalse(); diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ZenPolicyTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ZenPolicyTest.java index 57e11328d5e1..3a88294a0fa1 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ZenPolicyTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ZenPolicyTest.java @@ -218,7 +218,7 @@ public class ZenPolicyTest extends UiServiceTestCase { // unset applied, channels setting keeps its state channelsPriority.apply(unset); - assertThat(channelsPriority.getPriorityChannels()).isEqualTo(ZenPolicy.STATE_ALLOW); + assertThat(channelsPriority.getPriorityChannelsAllowed()).isEqualTo(ZenPolicy.STATE_ALLOW); } @Test @@ -234,7 +234,7 @@ public class ZenPolicyTest extends UiServiceTestCase { // priority channels (less strict state) cannot override a setting that sets it to none none.apply(priority); - assertThat(none.getPriorityChannels()).isEqualTo(ZenPolicy.STATE_DISALLOW); + assertThat(none.getPriorityChannelsAllowed()).isEqualTo(ZenPolicy.STATE_DISALLOW); } @Test @@ -250,7 +250,7 @@ public class ZenPolicyTest extends UiServiceTestCase { // applying a policy with channelType=none overrides priority setting priority.apply(none); - assertThat(priority.getPriorityChannels()).isEqualTo(ZenPolicy.STATE_DISALLOW); + assertThat(priority.getPriorityChannelsAllowed()).isEqualTo(ZenPolicy.STATE_DISALLOW); } @Test @@ -265,7 +265,7 @@ public class ZenPolicyTest extends UiServiceTestCase { // applying a policy with a set channel type actually goes through unset.apply(priority); - assertThat(unset.getPriorityChannels()).isEqualTo(ZenPolicy.STATE_ALLOW); + assertThat(unset.getPriorityChannelsAllowed()).isEqualTo(ZenPolicy.STATE_ALLOW); } @Test @@ -379,7 +379,7 @@ public class ZenPolicyTest extends UiServiceTestCase { ZenPolicy.Builder builder = new ZenPolicy.Builder(); ZenPolicy policy = builder.build(); - assertThat(policy.getPriorityChannels()).isEqualTo(ZenPolicy.STATE_UNSET); + assertThat(policy.getPriorityChannelsAllowed()).isEqualTo(ZenPolicy.STATE_UNSET); } @Test @@ -696,7 +696,7 @@ public class ZenPolicyTest extends UiServiceTestCase { builder.allowPriorityChannels(true); ZenPolicy policy = builder.build(); - assertThat(policy.getPriorityChannels()).isEqualTo(ZenPolicy.STATE_UNSET); + assertThat(policy.getPriorityChannelsAllowed()).isEqualTo(ZenPolicy.STATE_UNSET); assertThat(policy.toString().contains("allowChannels")).isFalse(); } @@ -708,12 +708,12 @@ public class ZenPolicyTest extends UiServiceTestCase { ZenPolicy.Builder builder = new ZenPolicy.Builder(); builder.allowPriorityChannels(true); ZenPolicy policy = builder.build(); - assertThat(policy.getPriorityChannels()).isEqualTo(ZenPolicy.STATE_ALLOW); + assertThat(policy.getPriorityChannelsAllowed()).isEqualTo(ZenPolicy.STATE_ALLOW); // disallow priority channels builder.allowPriorityChannels(false); policy = builder.build(); - assertThat(policy.getPriorityChannels()).isEqualTo(ZenPolicy.STATE_DISALLOW); + assertThat(policy.getPriorityChannelsAllowed()).isEqualTo(ZenPolicy.STATE_DISALLOW); } @Test @@ -734,7 +734,7 @@ public class ZenPolicyTest extends UiServiceTestCase { assertThat(newPolicy.getVisualEffectBadge()).isEqualTo(ZenPolicy.STATE_DISALLOW); assertThat(newPolicy.getVisualEffectPeek()).isEqualTo(ZenPolicy.STATE_UNSET); - assertThat(newPolicy.getPriorityChannels()).isEqualTo(ZenPolicy.STATE_ALLOW); + assertThat(newPolicy.getPriorityChannelsAllowed()).isEqualTo(ZenPolicy.STATE_ALLOW); } @Test |