Merge "AudioManager: rename getLastAudibleVolumeGroupVolume" (58cc973f) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -6877,7 +6877,7 @@ package android.media {
		method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_AUDIO_ROUTING, "android.permission.QUERY_AUDIO_STATE"}) public java.util.List<android.media.AudioDeviceAttributes> getDevicesForAttributes(@NonNull android.media.AudioAttributes);
		method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_SYSTEM_SETTINGS) public java.util.List<java.lang.Integer> getIndependentStreamTypes();
		method @RequiresPermission("android.permission.QUERY_AUDIO_STATE") public int getLastAudibleStreamVolume(int);
		method @IntRange(from=0) @RequiresPermission("android.permission.QUERY_AUDIO_STATE") public int getLastAudibleVolumeGroupVolume(int);
		method @IntRange(from=0) @RequiresPermission("android.permission.QUERY_AUDIO_STATE") public int getLastAudibleVolumeForVolumeGroup(int);
		method @IntRange(from=0) public long getMaxAdditionalOutputDeviceDelay(@NonNull android.media.AudioDeviceInfo);
		method @IntRange(from=0) @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int getMaxVolumeIndexForAttributes(@NonNull android.media.AudioAttributes);
		method @IntRange(from=0) @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int getMinVolumeIndexForAttributes(@NonNull android.media.AudioAttributes);

media/java/android/media/AudioManager.java

+18 −4

Original line number	Diff line number	Diff line
		@@ -681,6 +681,20 @@ public class AudioManager {
		@Retention(RetentionPolicy.SOURCE)
		public @interface Flags {}

		/** @hide */
		@IntDef(flag = true, prefix = "FLAG", value = {
		FLAG_SHOW_UI,
		FLAG_ALLOW_RINGER_MODES,
		FLAG_PLAY_SOUND,
		FLAG_REMOVE_SOUND_AND_VIBRATE,
		FLAG_VIBRATE,
		FLAG_BLUETOOTH_ABS_VOLUME,
		FLAG_HDMI_SYSTEM_AUDIO_VOLUME,
		FLAG_FROM_KEY,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface SystemVolumeFlags {}

		// The iterator of TreeMap#entrySet() returns the entries in ascending key order.
		private static final TreeMap<Integer, String> FLAG_NAMES = new TreeMap<>();

		@@ -1445,7 +1459,7 @@ public class AudioManager {
		android.Manifest.permission.MODIFY_AUDIO_SYSTEM_SETTINGS,
		android.Manifest.permission.MODIFY_AUDIO_ROUTING
		})
		public void setVolumeGroupVolumeIndex(int groupId, int index, int flags) {
		public void setVolumeGroupVolumeIndex(int groupId, int index, @SystemVolumeFlags int flags) {
		final IAudioService service = getService();
		try {
		service.setVolumeGroupVolumeIndex(groupId, index, flags,
		@@ -1542,7 +1556,7 @@ public class AudioManager {
		* @throws SecurityException if the adjustment triggers a Do Not Disturb change and the caller
		* is not granted notification policy access.
		*/
		public void adjustVolumeGroupVolume(int groupId, int direction, int flags) {
		public void adjustVolumeGroupVolume(int groupId, int direction, @SystemVolumeFlags int flags) {
		IAudioService service = getService();
		try {
		service.adjustVolumeGroupVolume(groupId, direction, flags,
		@@ -1564,10 +1578,10 @@ public class AudioManager {
		@SystemApi
		@RequiresPermission("android.permission.QUERY_AUDIO_STATE")
		@IntRange(from = 0)
		public int getLastAudibleVolumeGroupVolume(int groupId) {
		public int getLastAudibleVolumeForVolumeGroup(int groupId) {
		IAudioService service = getService();
		try {
		return service.getLastAudibleVolumeGroupVolume(groupId);
		return service.getLastAudibleVolumeForVolumeGroup(groupId);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}

media/java/android/media/IAudioService.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -153,7 +153,7 @@ interface IAudioService {
		int getVolumeGroupMinVolumeIndex(int groupId);

		@EnforcePermission("QUERY_AUDIO_STATE")
		int getLastAudibleVolumeGroupVolume(int groupId);
		int getLastAudibleVolumeForVolumeGroup(int groupId);

		boolean isVolumeGroupMuted(int groupId);

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -4032,10 +4032,10 @@ public class AudioService extends IAudioService.Stub
		vgs.adjustVolume(direction, flags);
		}

		/** @see AudioManager#getLastAudibleVolumeGroupVolume(int) */
		/** @see AudioManager#getLastAudibleVolumeForVolumeGroup(int) */
		@android.annotation.EnforcePermission(android.Manifest.permission.QUERY_AUDIO_STATE)
		public int getLastAudibleVolumeGroupVolume(int groupId) {
		super.getLastAudibleVolumeGroupVolume_enforcePermission();
		public int getLastAudibleVolumeForVolumeGroup(int groupId) {
		super.getLastAudibleVolumeForVolumeGroup_enforcePermission();
		synchronized (VolumeStreamState.class) {
		if (sVolumeGroupStates.indexOfKey(groupId) < 0) {
		Log.e(TAG, ": no volume group found for id " + groupId);