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

Commit 5c7b2aa9 authored by Yuri Lin's avatar Yuri Lin Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I0bcd9818582db9e4dbf08a16cfd5ed9c8a8eb909
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 64205590 b1d34981

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

+2 −3
Original line number Diff line number Diff line
@@ -1008,9 +1008,8 @@ public class ZenModeConfig implements Parcelable { 
                .allowAlarms(allowAlarms)

                .allowMedia(allowMedia)

                .allowSystem(allowSystem)

                .allowConversations(allowConversations

                        ? ZenModeConfig.getZenPolicySenders(allowConversationsFrom)

                        : ZenPolicy.PEOPLE_TYPE_NONE);

                .allowConversations(allowConversations ? allowConversationsFrom

                        : ZenPolicy.CONVERSATION_SENDERS_NONE);

        if (suppressedVisualEffects == 0) {

            builder.showAllVisualEffects();

        } else {

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

+12 −0
Original line number Diff line number Diff line
@@ -120,12 +120,20 @@ public class ZenModeConfigTest extends UiServiceTestCase { 
                .showLights(false)

                .showBadges(false)

                .showInAmbientDisplay(false)

                .allowCalls(ZenPolicy.PEOPLE_TYPE_CONTACTS)

                .allowMessages(ZenPolicy.PEOPLE_TYPE_STARRED)

                .allowConversations(ZenPolicy.CONVERSATION_SENDERS_NONE)

                .build();



        ZenModeConfig config = getMutedAllConfig();

        config.allowAlarms = true;

        config.allowReminders = 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_LIGHTS;

        config.suppressedVisualEffects |= Policy.SUPPRESSED_EFFECT_AMBIENT;
@@ -138,6 +146,10 @@ public class ZenModeConfigTest extends UiServiceTestCase { 
        assertEquals(expected.getPriorityCategoryEvents(), actual.getPriorityCategoryEvents());

        assertEquals(expected.getVisualEffectLights(), actual.getVisualEffectLights());

        assertEquals(expected.getVisualEffectAmbient(), actual.getVisualEffectAmbient());

        assertEquals(expected.getPriorityConversationSenders(),

                actual.getPriorityConversationSenders());

        assertEquals(expected.getPriorityCallSenders(), actual.getPriorityCallSenders());

        assertEquals(expected.getPriorityMessageSenders(), actual.getPriorityMessageSenders());

    }



    @Test