Merge changes I590ac9ac,Ie5eb77ab into main (1ad94356) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioManager.java

+5 −32

Original line number	Diff line number	Diff line
		@@ -29,8 +29,6 @@ import static android.media.audio.Flags.FLAG_SCO_MANAGED_BY_AUDIO;
		import static android.media.audio.Flags.FLAG_SUPPORTED_DEVICE_TYPES_API;
		import static android.media.audio.Flags.FLAG_UNIFY_ABSOLUTE_VOLUME_MANAGEMENT;
		import static android.media.audio.Flags.autoPublicVolumeApiHardening;
		import static android.media.audio.Flags.cacheGetStreamMinMaxVolume;
		import static android.media.audio.Flags.cacheGetStreamVolume;
		import static android.media.audiopolicy.Flags.FLAG_ENABLE_FADE_MANAGER_CONFIGURATION;
		import static android.media.audiopolicy.Flags.FLAG_MULTI_ZONE_AUDIO;

		@@ -1291,10 +1289,9 @@ public class AudioManager {
		* @hide
		**/
		public static void clearVolumeCache(String api) {
		if (cacheGetStreamMinMaxVolume() && (VOLUME_MAX_CACHING_API.equals(api)
		\|\| VOLUME_MIN_CACHING_API.equals(api))) {
		if (VOLUME_MAX_CACHING_API.equals(api) \|\| VOLUME_MIN_CACHING_API.equals(api)) {
		IpcDataCache.invalidateCache(IpcDataCache.MODULE_SYSTEM, api);
		} else if (cacheGetStreamVolume() && VOLUME_CACHING_API.equals(api)) {
		} else if (VOLUME_CACHING_API.equals(api)) {
		IpcDataCache.invalidateCache(IpcDataCache.MODULE_SYSTEM, api);
		} else {
		Log.w(TAG, "invalid clearVolumeCache for api " + api);
		@@ -1339,16 +1336,8 @@ public class AudioManager {
		* @see #getStreamVolume(int)
		*/
		public int getStreamMaxVolume(int streamType) {
		if (cacheGetStreamMinMaxVolume()) {
		return mVolMaxCache.query(new VolumeCacheQuery(streamType, QUERY_VOL_MAX));
		}
		final IAudioService service = getService();
		try {
		return service.getStreamMaxVolume(streamType);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Returns the minimum volume index for a particular stream.
		@@ -1375,16 +1364,8 @@ public class AudioManager {
		*/
		@TestApi
		public int getStreamMinVolumeInt(int streamType) {
		if (cacheGetStreamMinMaxVolume()) {
		return mVolMinCache.query(new VolumeCacheQuery(streamType, QUERY_VOL_MIN));
		}
		final IAudioService service = getService();
		try {
		return service.getStreamMinVolume(streamType);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Returns the current volume index for a particular stream.
		@@ -1395,16 +1376,8 @@ public class AudioManager {
		* @see #setStreamVolume(int, int, int)
		*/
		public int getStreamVolume(int streamType) {
		if (cacheGetStreamVolume()) {
		return mVolCache.query(new VolumeCacheQuery(streamType, QUERY_VOL));
		}
		final IAudioService service = getService();
		try {
		return service.getStreamVolume(streamType);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		// keep in sync with frameworks/av/services/audiopolicy/common/include/Volume.h
		private static final float VOLUME_MIN_DB = -758.0f;

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

+23 −38

Original line number	Diff line number	Diff line
		@@ -51,8 +51,6 @@ import static android.media.AudioManager.RINGER_MODE_SILENT;
		import static android.media.AudioManager.RINGER_MODE_VIBRATE;
		import static android.media.AudioManager.STREAM_SYSTEM;
		import static android.media.audio.Flags.autoPublicVolumeApiHardening;
		import static android.media.audio.Flags.cacheGetStreamMinMaxVolume;
		import static android.media.audio.Flags.cacheGetStreamVolume;
		import static android.media.audio.Flags.concurrentAudioRecordBypassPermission;
		import static android.media.audio.Flags.dapInjectionStarveManagement;
		import static android.media.audio.Flags.deviceVolumeApis;
		@@ -2039,13 +2037,11 @@ public class AudioService extends IAudioService.Stub
		mSpatializerHelper.onRoutingUpdated();
		}
		checkMuteAwaitConnection();
		if (cacheGetStreamVolume()) {
		if (DEBUG_VOL) {
		Log.d(TAG, "Clear volume cache after routing update");
		}
		AudioManager.clearVolumeCache(AudioManager.VOLUME_CACHING_API);
		}
		}

		//-----------------------------------------------------------------
		// rotation/fold updates coming from RotationHelper
		@@ -2804,7 +2800,6 @@ public class AudioService extends IAudioService.Stub
		checkMuteAffectedStreams();
		updateDefaultVolumes();

		if (cacheGetStreamVolume()) {
		if (DEBUG_VOL) {
		Log.d(TAG, "Clear volume cache after creating the stream states");
		}
		@@ -2812,7 +2807,6 @@ public class AudioService extends IAudioService.Stub
		AudioManager.clearVolumeCache(AudioManager.VOLUME_MIN_CACHING_API);
		AudioManager.clearVolumeCache(AudioManager.VOLUME_MAX_CACHING_API);
		}
		}

		/**
		* Update default indexes from aliased streams. Must be called after mStreamStates is created
		@@ -5505,10 +5499,8 @@ public class AudioService extends IAudioService.Stub
		+ ringMyCar());
		pw.println("\tandroid.media.audio.Flags.concurrentAudioRecordBypassPermission:"
		+ concurrentAudioRecordBypassPermission());
		pw.println("\tandroid.media.audio.Flags.cacheGetStreamMinMaxVolume:"
		+ cacheGetStreamMinMaxVolume());
		pw.println("\tandroid.media.audio.Flags.cacheGetStreamVolume:"
		+ cacheGetStreamVolume());
		pw.println("\tandroid.media.audio.Flags.cacheGetStreamMinMaxVolume - EOL");
		pw.println("\tandroid.media.audio.Flags.cacheGetStreamVolume - EOL");
		pw.println("\tcom.android.media.audio.optimizeBtDeviceSwitch:"
		+ optimizeBtDeviceSwitch());
		pw.println("\tandroid.media.audio.unifyAbsoluteVolumeManagement:"
		@@ -7597,14 +7589,12 @@ public class AudioService extends IAudioService.Stub
		streamState.mIsMuted = false;
		}
		}
		if (cacheGetStreamVolume()) {
		if (DEBUG_VOL) {
		Log.d(TAG,
		"Clear volume cache after possibly changing mute in readAudioSettings");
		}
		AudioManager.clearVolumeCache(AudioManager.VOLUME_CACHING_API);
		}
		}

		readVolumeGroupsSettings(userSwitch);

		@@ -9955,24 +9945,20 @@ public class AudioService extends IAudioService.Stub
		public void put(int key, int value) {
		super.put(key, value);
		record("put", key, value);
		if (cacheGetStreamVolume()) {
		if (DEBUG_VOL) {
		Log.d(TAG, "Clear volume cache after update index map");
		}
		AudioManager.clearVolumeCache(AudioManager.VOLUME_CACHING_API);
		}
		}
		@Override
		public void setValueAt(int index, int value) {
		super.setValueAt(index, value);
		record("setValueAt", keyAt(index), value);
		if (cacheGetStreamVolume()) {
		if (DEBUG_VOL) {
		Log.d(TAG, "Clear volume cache after update index map");
		}
		AudioManager.clearVolumeCache(AudioManager.VOLUME_CACHING_API);
		}
		}

		// Record all changes in the VolumeStreamState
		private void record(String event, int key, int value) {
		@@ -10082,7 +10068,7 @@ public class AudioService extends IAudioService.Stub
		mIndexMinNoPerm = mIndexMin;
		}
		}
		if (cacheGetStreamMinMaxVolume() && mStreamType == AudioSystem.STREAM_VOICE_CALL) {
		if (mStreamType == AudioSystem.STREAM_VOICE_CALL) {
		if (DEBUG_VOL) {
		Log.d(TAG, "Clear min volume cache from updateIndexFactors");
		}
		@@ -10134,8 +10120,7 @@ public class AudioService extends IAudioService.Stub
		* @param index minimum index expressed in "UI units", i.e. no 10x factor
		*/
		public void updateNoPermMinIndex(int index) {
		boolean changedNoPermMinIndex =
		cacheGetStreamMinMaxVolume() && (index * 10) != mIndexMinNoPerm;
		boolean changedNoPermMinIndex = (index * 10) != mIndexMinNoPerm;
		mIndexMinNoPerm = index * 10;
		if (mIndexMinNoPerm < mIndexMin) {
		Log.e(TAG, "Invalid mIndexMinNoPerm for stream " + mStreamType);
		@@ -10732,7 +10717,7 @@ public class AudioService extends IAudioService.Stub
		}
		}

		if (cacheGetStreamVolume() && changed) {
		if (changed) {
		if (DEBUG_VOL) {
		Log.d(TAG, "Clear volume cache after changing mute state");
		}