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

Commit ff643074 authored by Yuri Lin's avatar Yuri Lin Committed by Android (Google) Code Review
Browse files

Merge "Rename ZenPolicy.getPriorityChannels to getPriorityChannelsAllowed" into main

parents 3b5ba3fc d14f5edb

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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();

core/java/android/service/notification/ZenModeConfig.java

+2 −2
Original line number Diff line number Diff line
@@ -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));

        }

core/java/android/service/notification/ZenPolicy.java

+2 −2
Original line number Diff line number Diff line
@@ -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();

services/core/java/com/android/server/notification/ZenModeHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -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()

services/tests/uiservicestests/src/com/android/server/notification/ZenAdaptersTest.java

+6 −4
Original line number Diff line number Diff line
@@ -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);

    }

}