Merge "AudioService: use AudioSystem adapter for more methods" (da0f644d) · Commits · e / os / android_frameworks_base

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

+38 −38

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

+122 −0

Original line number	Original line	Diff line number	Diff line
	@@ -17,9 +17,12 @@
	package com.android.server.audio;		package com.android.server.audio;

	import android.annotation.NonNull;		import android.annotation.NonNull;
			import android.media.AudioAttributes;
	import android.media.AudioDeviceAttributes;		import android.media.AudioDeviceAttributes;
	import android.media.AudioSystem;		import android.media.AudioSystem;
			import android.media.audiopolicy.AudioMix;

			import java.util.ArrayList;
	import java.util.List;		import java.util.List;

	/**		/**
	@@ -39,6 +42,25 @@ public class AudioSystemAdapter {
	return new AudioSystemAdapter();		return new AudioSystemAdapter();
	}		}

			/**
			* Same as {@link AudioSystem#getDevicesForStream(int)}
			* @param stream a valid stream type
			* @return a mask of device types
			*/
			public int getDevicesForStream(int stream) {
			return AudioSystem.getDevicesForStream(stream);
			}

			/**
			* Same as {@link AudioSystem#getDevicesForAttributes(AudioAttributes)}
			* @param attributes the attributes for which the routing is queried
			* @return the devices that the stream with the given attributes would be routed to
			*/
			public @NonNull ArrayList<AudioDeviceAttributes> getDevicesForAttributes(
			@NonNull AudioAttributes attributes) {
			return AudioSystem.getDevicesForAttributes(attributes);
			}

	/**		/**
	* Same as {@link AudioSystem#setDeviceConnectionState(int, int, String, String, int)}		* Same as {@link AudioSystem#setDeviceConnectionState(int, int, String, String, int)}
	* @param device		* @param device
	@@ -178,4 +200,104 @@ public class AudioSystemAdapter {
	public boolean isStreamActive(int stream, int inPastMs) {		public boolean isStreamActive(int stream, int inPastMs) {
	return AudioSystem.isStreamActive(stream, inPastMs);		return AudioSystem.isStreamActive(stream, inPastMs);
	}		}

			/**
			* Same as {@link AudioSystem#isStreamActiveRemotely(int, int)}
			* @param stream
			* @param inPastMs
			* @return
			*/
			public boolean isStreamActiveRemotely(int stream, int inPastMs) {
			return AudioSystem.isStreamActiveRemotely(stream, inPastMs);
			}

			/**
			* Same as {@link AudioSystem#setPhoneState(int, int)}
			* @param state
			* @param uid
			* @return
			*/
			public int setPhoneState(int state, int uid) {
			return AudioSystem.setPhoneState(state, uid);
			}

			/**
			* Same as {@link AudioSystem#setAllowedCapturePolicy(int, int)}
			* @param uid
			* @param flags
			* @return
			*/
			public int setAllowedCapturePolicy(int uid, int flags) {
			return AudioSystem.setAllowedCapturePolicy(uid, flags);
			}

			/**
			* Same as {@link AudioSystem#setForceUse(int, int)}
			* @param usage
			* @param config
			* @return
			*/
			public int setForceUse(int usage, int config) {
			return AudioSystem.setForceUse(usage, config);
			}

			/**
			* Same as {@link AudioSystem#getForceUse(int)}
			* @param usage
			* @return
			*/
			public int getForceUse(int usage) {
			return AudioSystem.getForceUse(usage);
			}

			/**
			* Same as {@link AudioSystem#registerPolicyMixes(ArrayList, boolean)}
			* @param mixes
			* @param register
			* @return
			*/
			public int registerPolicyMixes(ArrayList<AudioMix> mixes, boolean register) {
			return AudioSystem.registerPolicyMixes(mixes, register);
			}

			/**
			* Same as {@link AudioSystem#setUidDeviceAffinities(int, int[], String[])}
			* @param uid
			* @param types
			* @param addresses
			* @return
			*/
			public int setUidDeviceAffinities(int uid, @NonNull int[] types, @NonNull String[] addresses) {
			return AudioSystem.setUidDeviceAffinities(uid, types, addresses);
			}

			/**
			* Same as {@link AudioSystem#removeUidDeviceAffinities(int)}
			* @param uid
			* @return
			*/
			public int removeUidDeviceAffinities(int uid) {
			return AudioSystem.removeUidDeviceAffinities(uid);
			}

			/**
			* Same as {@link AudioSystem#setUserIdDeviceAffinities(int, int[], String[])}
			* @param userId
			* @param types
			* @param addresses
			* @return
			*/
			public int setUserIdDeviceAffinities(int userId, @NonNull int[] types,
			@NonNull String[] addresses) {
			return AudioSystem.setUserIdDeviceAffinities(userId, types, addresses);
			}

			/**
			* Same as {@link AudioSystem#removeUserIdDeviceAffinities(int)}
			* @param userId
			* @return
			*/
			public int removeUserIdDeviceAffinities(int userId) {
			return AudioSystem.removeUserIdDeviceAffinities(userId);
			}
	}		}

Original line number	Original line	Diff line number	Diff line
	@@ -1078,7 +1078,7 @@ public class AudioService extends IAudioService.Stub

	// Restore call state		// Restore call state
	synchronized (mDeviceBroker.mSetModeLock) {		synchronized (mDeviceBroker.mSetModeLock) {
	if (AudioSystem.setPhoneState(mMode, getModeOwnerUid())		if (mAudioSystem.setPhoneState(mMode, getModeOwnerUid())
	== AudioSystem.AUDIO_STATUS_OK) {		== AudioSystem.AUDIO_STATUS_OK) {
	mModeLogger.log(new AudioEventLogger.StringEvent(		mModeLogger.log(new AudioEventLogger.StringEvent(
	"onAudioServerDied causes setPhoneState(" + AudioSystem.modeToString(mMode)		"onAudioServerDied causes setPhoneState(" + AudioSystem.modeToString(mMode)
	@@ -1165,7 +1165,7 @@ public class AudioService extends IAudioService.Stub
	HashMap<Integer, Integer> allowedCapturePolicies =		HashMap<Integer, Integer> allowedCapturePolicies =
	mPlaybackMonitor.getAllAllowedCapturePolicies();		mPlaybackMonitor.getAllAllowedCapturePolicies();
	for (HashMap.Entry<Integer, Integer> entry : allowedCapturePolicies.entrySet()) {		for (HashMap.Entry<Integer, Integer> entry : allowedCapturePolicies.entrySet()) {
	int result = AudioSystem.setAllowedCapturePolicy(		int result = mAudioSystem.setAllowedCapturePolicy(
	entry.getKey(),		entry.getKey(),
	AudioAttributes.capturePolicyToFlags(entry.getValue(), 0x0));		AudioAttributes.capturePolicyToFlags(entry.getValue(), 0x0));
	if (result != AudioSystem.AUDIO_STATUS_OK) {		if (result != AudioSystem.AUDIO_STATUS_OK) {
	@@ -2112,7 +2112,7 @@ public class AudioService extends IAudioService.Stub
	protected @NonNull ArrayList<AudioDeviceAttributes> getDevicesForAttributesInt(		protected @NonNull ArrayList<AudioDeviceAttributes> getDevicesForAttributesInt(
	@NonNull AudioAttributes attributes) {		@NonNull AudioAttributes attributes) {
	Objects.requireNonNull(attributes);		Objects.requireNonNull(attributes);
	return AudioSystem.getDevicesForAttributes(attributes);		return mAudioSystem.getDevicesForAttributes(attributes);
	}		}

	/** Indicates no special treatment in the handling of the volume adjustement */		/** Indicates no special treatment in the handling of the volume adjustement */
	@@ -2219,7 +2219,7 @@ public class AudioService extends IAudioService.Stub
	\|\| maybeActiveStreamType == AudioSystem.STREAM_NOTIFICATION) {		\|\| maybeActiveStreamType == AudioSystem.STREAM_NOTIFICATION) {
	activeForReal = wasStreamActiveRecently(maybeActiveStreamType, 0);		activeForReal = wasStreamActiveRecently(maybeActiveStreamType, 0);
	} else {		} else {
	activeForReal = AudioSystem.isStreamActive(maybeActiveStreamType, 0);		activeForReal = mAudioSystem.isStreamActive(maybeActiveStreamType, 0);
	}		}
	if (activeForReal \|\| mVolumeControlStream == -1) {		if (activeForReal \|\| mVolumeControlStream == -1) {
	streamType = maybeActiveStreamType;		streamType = maybeActiveStreamType;
	@@ -2916,7 +2916,7 @@ public class AudioService extends IAudioService.Stub
	int streamType = getHearingAidStreamType(newMode);		int streamType = getHearingAidStreamType(newMode);

	final Set<Integer> deviceTypes = AudioSystem.generateAudioDeviceTypesSet(		final Set<Integer> deviceTypes = AudioSystem.generateAudioDeviceTypesSet(
	AudioSystem.getDevicesForStream(streamType));		mAudioSystem.getDevicesForStream(streamType));
	final Set<Integer> absVolumeMultiModeCaseDevices = AudioSystem.intersectionAudioDeviceTypes(		final Set<Integer> absVolumeMultiModeCaseDevices = AudioSystem.intersectionAudioDeviceTypes(
	mAbsVolumeMultiModeCaseDevices, deviceTypes);		mAbsVolumeMultiModeCaseDevices, deviceTypes);
	if (absVolumeMultiModeCaseDevices.isEmpty()) {		if (absVolumeMultiModeCaseDevices.isEmpty()) {