Merge "AudioAttributes: handle unknown usage like media" into pi-dev (3a8ddbcc) · Commits · e / os / android_frameworks_base

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() +

+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