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

Commit 9a68e9b2 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by android-build-merger
Browse files

Merge "DnD: Total silence doesn't suppress A11y" into oc-dev 

am: 9f149436

Change-Id: Iaa671d4c7008609f0be7430b8f6c35f1021c7586
parents e2744c27 9f149436

media/java/android/media/AudioAttributes.java

+7 −0
Original line number Diff line number Diff line
@@ -194,6 +194,12 @@ public final class AudioAttributes implements Parcelable { 
     * @see #SUPPRESSIBLE_USAGES

     */

    public final static int SUPPRESSIBLE_CALL = 2;

    /**

     * @hide

     * Denotes a usage that is never going to be muted, even in Total Silence.

     * @see #SUPPRESSIBLE_USAGES

     */

    public final static int SUPPRESSIBLE_NEVER = 3;



    /**

     * @hide
@@ -211,6 +217,7 @@ public final class AudioAttributes implements Parcelable { 
        SUPPRESSIBLE_USAGES.put(USAGE_NOTIFICATION_COMMUNICATION_INSTANT,SUPPRESSIBLE_NOTIFICATION);

        SUPPRESSIBLE_USAGES.put(USAGE_NOTIFICATION_COMMUNICATION_DELAYED,SUPPRESSIBLE_NOTIFICATION);

        SUPPRESSIBLE_USAGES.put(USAGE_NOTIFICATION_EVENT,                SUPPRESSIBLE_NOTIFICATION);

        SUPPRESSIBLE_USAGES.put(USAGE_ASSISTANCE_ACCESSIBILITY,          SUPPRESSIBLE_NEVER);

    }



    /**

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

+3 −1
Original line number Diff line number Diff line
@@ -762,7 +762,9 @@ public class ZenModeHelper { 


        for (int usage : AudioAttributes.SDK_USAGES) {

            final int suppressionBehavior = AudioAttributes.SUPPRESSIBLE_USAGES.get(usage);

            if (suppressionBehavior == AudioAttributes.SUPPRESSIBLE_NOTIFICATION) {

            if (suppressionBehavior == AudioAttributes.SUPPRESSIBLE_NEVER) {

                applyRestrictions(false /*mute*/, usage);

            } else if (suppressionBehavior == AudioAttributes.SUPPRESSIBLE_NOTIFICATION) {

                applyRestrictions(muteNotifications || muteEverything, usage);

            } else if (suppressionBehavior == AudioAttributes.SUPPRESSIBLE_CALL) {

                applyRestrictions(muteCalls || muteEverything, usage);