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

Commit 6d38a1b2 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi
Browse files

AudioAttributes: handle unknown usage like media 

In the native audio policy management, the default stream type
  for volume is STREAM_MUSIC, i.e. any player by default is
  considered a "media" player. Do the same for audio attributes
  with regards to suppressible behaviors.

Bug: 74052135
Test: ZenModeHelperTest + see bug
Change-Id: I8f65044807fd3e745f21e031a0aa01a5e6f74cd2
parent cfa439f0

media/java/android/media/AudioAttributes.java

+3 −3
Original line number Diff line number Diff line
@@ -250,9 +250,10 @@ public final class AudioAttributes implements Parcelable { 
        SUPPRESSIBLE_USAGES.put(USAGE_ASSISTANCE_NAVIGATION_GUIDANCE,    SUPPRESSIBLE_MEDIA);

        SUPPRESSIBLE_USAGES.put(USAGE_GAME,                              SUPPRESSIBLE_MEDIA);

        SUPPRESSIBLE_USAGES.put(USAGE_ASSISTANT,                         SUPPRESSIBLE_MEDIA);

        /** default volume assignment is STREAM_MUSIC, handle unknown usage as media */

        SUPPRESSIBLE_USAGES.put(USAGE_UNKNOWN,                           SUPPRESSIBLE_MEDIA);

        SUPPRESSIBLE_USAGES.put(USAGE_VOICE_COMMUNICATION_SIGNALLING,    SUPPRESSIBLE_SYSTEM);

        SUPPRESSIBLE_USAGES.put(USAGE_ASSISTANCE_SONIFICATION,           SUPPRESSIBLE_SYSTEM);

        SUPPRESSIBLE_USAGES.put(USAGE_UNKNOWN,                           SUPPRESSIBLE_SYSTEM);

    }



    /**
@@ -1057,8 +1058,7 @@ public final class AudioAttributes implements Parcelable { 
            case USAGE_ASSISTANCE_ACCESSIBILITY:

                return AudioSystem.STREAM_ACCESSIBILITY;

            case USAGE_UNKNOWN:

                return fromGetVolumeControlStream ?

                        AudioManager.USE_DEFAULT_STREAM_TYPE : AudioSystem.STREAM_MUSIC;

                return AudioSystem.STREAM_MUSIC;

            default:

                if (fromGetVolumeControlStream) {

                    throw new IllegalArgumentException("Unknown usage value " + aa.getUsage() +

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

+2 −2
Original line number Diff line number Diff line
@@ -201,12 +201,12 @@ public class ZenModeHelperTest extends UiServiceTestCase { 
                AudioAttributes.USAGE_MEDIA);

        verify(mZenModeHelperSpy, atLeastOnce()).applyRestrictions(false,

                AudioAttributes.USAGE_GAME);

        verify(mZenModeHelperSpy, atLeastOnce()).applyRestrictions(false,

                AudioAttributes.USAGE_UNKNOWN);



        // Alarms only will silence system noises (but not vibrations)

        verify(mZenModeHelperSpy, atLeastOnce()).applyRestrictions(true,

                AudioAttributes.USAGE_ASSISTANCE_SONIFICATION, AppOpsManager.OP_PLAY_AUDIO);

        verify(mZenModeHelperSpy, atLeastOnce()).applyRestrictions(true,

                AudioAttributes.USAGE_UNKNOWN);

    }



    @Test