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

Commit 6bc5d367 authored by Beverly's avatar Beverly Committed by Beverly Tai
Browse files

Update equals and hashCode methods of NoMan.Policy 

Test: atest AudioManagerTest#testPriorityOnlyChannelsCanBypassDnd
Fixes: 142643922
Change-Id: I15835f784ba73b40eccf92a0a430905d28647669
Merged-In: I15835f784ba73b40eccf92a0a430905d28647669
(cherry picked from commit 4f8b0224)
parent 2080a059

core/java/android/app/NotificationManager.java

+3 −3
Original line number Diff line number Diff line
@@ -1657,7 +1657,7 @@ public class NotificationManager { 
        @Override

        public int hashCode() {

            return Objects.hash(priorityCategories, priorityCallSenders, priorityMessageSenders,

                    suppressedVisualEffects);

                    suppressedVisualEffects, state);

        }



        @Override
@@ -1669,10 +1669,10 @@ public class NotificationManager { 
                    && other.priorityCallSenders == priorityCallSenders

                    && other.priorityMessageSenders == priorityMessageSenders

                    && suppressedVisualEffectsEqual(suppressedVisualEffects,

                    other.suppressedVisualEffects);

                    other.suppressedVisualEffects)

                    && other.state == this.state;

        }





        private boolean suppressedVisualEffectsEqual(int suppressedEffects,

                int otherSuppressedVisualEffects) {

            if (suppressedEffects == otherSuppressedVisualEffects) {

services/core/java/com/android/server/audio/AudioService.java

+13 −7
Original line number Diff line number Diff line
@@ -4016,8 +4016,7 @@ public class AudioService extends IAudioService.Stub 
        final boolean muteSystem = (zenPolicy.priorityCategories

                & NotificationManager.Policy.PRIORITY_CATEGORY_SYSTEM) == 0;

        final boolean muteNotificationAndRing = ZenModeConfig

                .areAllPriorityOnlyNotificationZenSoundsMuted(

                        mNm.getConsolidatedNotificationPolicy());

                .areAllPriorityOnlyNotificationZenSoundsMuted(zenPolicy);

        return muteAlarms && isAlarm(streamType)

                || muteMedia && isMedia(streamType)

                || muteSystem && isSystem(streamType)
@@ -4029,11 +4028,13 @@ public class AudioService extends IAudioService.Stub 
    }



    /**

     * DND total silence: media and alarms streams are tied to the muted ringer

     * {@link ZenModeHelper.RingerModeDelegate#getRingerModeAffectedStreams(int)}

     * DND alarms only: notification, ringer + system muted (by default tied to muted ringer mode)

     * DND priority only: alarms, media, system streams can be muted separate from ringer based on

     * zenPolicy (this method determines which streams)

     * Notifications, ringer and system sounds are controlled by the ringer:

     * {@link ZenModeHelper.RingerModeDelegate#getRingerModeAffectedStreams(int)} but can

     * also be muted by DND based on the DND mode:

     * DND total silence: media and alarms streams can be muted by DND

     * DND alarms only: no streams additionally controlled by DND

     * DND priority only: alarms, media, system, ringer and notification streams can be muted by

     * DND.  The current applied zenPolicy determines which streams will be muted by DND.

     * @return true if changed, else false

     */

    private boolean updateZenModeAffectedStreams() {
@@ -4054,6 +4055,11 @@ public class AudioService extends IAudioService.Stub 
                    & NotificationManager.Policy.PRIORITY_CATEGORY_SYSTEM) == 0) {

                zenModeAffectedStreams |= 1 << AudioManager.STREAM_SYSTEM;

            }



            if (ZenModeConfig.areAllPriorityOnlyNotificationZenSoundsMuted(zenPolicy)) {

                zenModeAffectedStreams |= 1 << AudioManager.STREAM_NOTIFICATION;

                zenModeAffectedStreams |= 1 << AudioManager.STREAM_RING;

            }

        }



        if (mZenModeAffectedStreams != zenModeAffectedStreams) {

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

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ public class ZenModeConfigTest extends UiServiceTestCase { 
        suppressedVisualEffects |= Policy.SUPPRESSED_EFFECT_AMBIENT;



        Policy expectedPolicy = new Policy(priorityCategories, priorityCallSenders,

                priorityMessageSenders, suppressedVisualEffects);

                priorityMessageSenders, suppressedVisualEffects, 0);



        assertEquals(expectedPolicy, config.toNotificationPolicy(zenPolicy));

    }