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

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

Merge "Total Silence vs VoIP" into oc-dr1-dev 

am: 92e1d0ab

Change-Id: I7a1123ed362d884dfbbee21c8e04595e55844ecd
parents 14506791 92e1d0ab

media/java/android/media/AudioAttributes.java

+1 −0
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ public final class AudioAttributes implements Parcelable { 
        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);

        SUPPRESSIBLE_USAGES.put(USAGE_VOICE_COMMUNICATION,               SUPPRESSIBLE_NEVER);

    }



    /**