Merge "Support set/clear/get preferred device for capture preset." (617d1495) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+9 −0

Original line number	Diff line number	Diff line
		@@ -4146,8 +4146,10 @@ package android.media {
		public class AudioManager {
		method @Deprecated public int abandonAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener, android.media.AudioAttributes);
		method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void addOnPreferredDeviceForStrategyChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.media.AudioManager.OnPreferredDeviceForStrategyChangedListener) throws java.lang.SecurityException;
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void addOnPreferredDevicesForCapturePresetChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.media.AudioManager.OnPreferredDevicesForCapturePresetChangedListener) throws java.lang.SecurityException;
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void addOnPreferredDevicesForStrategyChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.media.AudioManager.OnPreferredDevicesForStrategyChangedListener) throws java.lang.SecurityException;
		method public void clearAudioServerStateCallback();
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public boolean clearPreferredDevicesForCapturePreset(int);
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int dispatchAudioFocusChange(@NonNull android.media.AudioFocusInfo, int, @NonNull android.media.audiopolicy.AudioPolicy);
		method @IntRange(from=0) public long getAdditionalOutputDeviceDelay(@NonNull android.media.AudioDeviceInfo);
		method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static java.util.List<android.media.audiopolicy.AudioProductStrategy> getAudioProductStrategies();
		@@ -4157,6 +4159,7 @@ package android.media {
		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);
		method @Nullable @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public android.media.AudioDeviceAttributes getPreferredDeviceForStrategy(@NonNull android.media.audiopolicy.AudioProductStrategy);
		method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public java.util.List<android.media.AudioDeviceAttributes> getPreferredDevicesForCapturePreset(int);
		method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public java.util.List<android.media.AudioDeviceAttributes> getPreferredDevicesForStrategy(@NonNull android.media.audiopolicy.AudioProductStrategy);
		method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int[] getSupportedSystemUsages();
		method @IntRange(from=0) @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int getVolumeIndexForAttributes(@NonNull android.media.AudioAttributes);
		@@ -4165,6 +4168,7 @@ package android.media {
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int registerAudioPolicy(@NonNull android.media.audiopolicy.AudioPolicy);
		method public void registerVolumeGroupCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.AudioManager.VolumeGroupCallback);
		method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void removeOnPreferredDeviceForStrategyChangedListener(@NonNull android.media.AudioManager.OnPreferredDeviceForStrategyChangedListener);
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void removeOnPreferredDevicesForCapturePresetChangedListener(@NonNull android.media.AudioManager.OnPreferredDevicesForCapturePresetChangedListener);
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void removeOnPreferredDevicesForStrategyChangedListener(@NonNull android.media.AudioManager.OnPreferredDevicesForStrategyChangedListener);
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public boolean removePreferredDeviceForStrategy(@NonNull android.media.audiopolicy.AudioProductStrategy);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int requestAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener, @NonNull android.media.AudioAttributes, int, int) throws java.lang.IllegalArgumentException;
		@@ -4173,6 +4177,7 @@ package android.media {
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public boolean setAdditionalOutputDeviceDelay(@NonNull android.media.AudioDeviceInfo, @IntRange(from=0) long);
		method public void setAudioServerStateCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.AudioManager.AudioServerStateCallback);
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void setFocusRequestResult(@NonNull android.media.AudioFocusInfo, int, @NonNull android.media.audiopolicy.AudioPolicy);
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public boolean setPreferredDeviceForCapturePreset(int, @NonNull android.media.AudioDeviceAttributes);
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public boolean setPreferredDeviceForStrategy(@NonNull android.media.audiopolicy.AudioProductStrategy, @NonNull android.media.AudioDeviceAttributes);
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public boolean setPreferredDevicesForStrategy(@NonNull android.media.audiopolicy.AudioProductStrategy, @NonNull java.util.List<android.media.AudioDeviceAttributes>);
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void setSupportedSystemUsages(@NonNull int[]);
		@@ -4197,6 +4202,10 @@ package android.media {
		method @Deprecated public void onPreferredDeviceForStrategyChanged(@NonNull android.media.audiopolicy.AudioProductStrategy, @Nullable android.media.AudioDeviceAttributes);
		}

		public static interface AudioManager.OnPreferredDevicesForCapturePresetChangedListener {
		method public void onPreferredDevicesForCapturePresetChanged(int, @NonNull java.util.List<android.media.AudioDeviceAttributes>);
		}

		public static interface AudioManager.OnPreferredDevicesForStrategyChangedListener {
		method public void onPreferredDevicesForStrategyChanged(@NonNull android.media.audiopolicy.AudioProductStrategy, @NonNull java.util.List<android.media.AudioDeviceAttributes>);
		}

core/jni/android_media_AudioSystem.cpp

+83 −0

Original line number	Diff line number	Diff line
		@@ -2408,6 +2408,79 @@ static jint android_media_AudioSystem_getDevicesForRoleAndStrategy(JNIEnv *env,
		return AUDIO_JAVA_SUCCESS;
		}

		static jint android_media_AudioSystem_setDevicesRoleForCapturePreset(
		JNIEnv *env, jobject thiz, jint capturePreset, jint role, jintArray jDeviceTypes,
		jobjectArray jDeviceAddresses) {
		AudioDeviceTypeAddrVector nDevices;
		jint results = getVectorOfAudioDeviceTypeAddr(env, jDeviceTypes, jDeviceAddresses, nDevices);
		if (results != NO_ERROR) {
		return results;
		}
		int status = check_AudioSystem_Command(
		AudioSystem::setDevicesRoleForCapturePreset((audio_source_t)capturePreset,
		(device_role_t)role, nDevices));
		return (jint)status;
		}

		static jint android_media_AudioSystem_addDevicesRoleForCapturePreset(
		JNIEnv *env, jobject thiz, jint capturePreset, jint role, jintArray jDeviceTypes,
		jobjectArray jDeviceAddresses) {
		AudioDeviceTypeAddrVector nDevices;
		jint results = getVectorOfAudioDeviceTypeAddr(env, jDeviceTypes, jDeviceAddresses, nDevices);
		if (results != NO_ERROR) {
		return results;
		}
		int status = check_AudioSystem_Command(
		AudioSystem::addDevicesRoleForCapturePreset((audio_source_t)capturePreset,
		(device_role_t)role, nDevices));
		return (jint)status;
		}

		static jint android_media_AudioSystem_removeDevicesRoleForCapturePreset(
		JNIEnv *env, jobject thiz, jint capturePreset, jint role, jintArray jDeviceTypes,
		jobjectArray jDeviceAddresses) {
		AudioDeviceTypeAddrVector nDevices;
		jint results = getVectorOfAudioDeviceTypeAddr(env, jDeviceTypes, jDeviceAddresses, nDevices);
		if (results != NO_ERROR) {
		return results;
		}
		int status = check_AudioSystem_Command(
		AudioSystem::removeDevicesRoleForCapturePreset((audio_source_t)capturePreset,
		(device_role_t)role, nDevices));
		return (jint)status;
		}

		static jint android_media_AudioSystem_clearDevicesRoleForCapturePreset(JNIEnv *env, jobject thiz,
		jint capturePreset,
		jint role) {
		return (jint)check_AudioSystem_Command(
		AudioSystem::clearDevicesRoleForCapturePreset((audio_source_t)capturePreset,
		(device_role_t)role));
		}

		static jint android_media_AudioSystem_getDevicesForRoleAndCapturePreset(JNIEnv *env, jobject thiz,
		jint capturePreset,
		jint role,
		jobject jDevices) {
		AudioDeviceTypeAddrVector nDevices;
		status_t status = check_AudioSystem_Command(
		AudioSystem::getDevicesForRoleAndCapturePreset((audio_source_t)capturePreset,
		(device_role_t)role, nDevices));
		if (status != NO_ERROR) {
		return (jint)status;
		}
		for (const auto &device : nDevices) {
		jobject jAudioDeviceAttributes = NULL;
		jint jStatus = createAudioDeviceAttributesFromNative(env, &jAudioDeviceAttributes, &device);
		if (jStatus != AUDIO_JAVA_SUCCESS) {
		return jStatus;
		}
		env->CallBooleanMethod(jDevices, gListMethods.add, jAudioDeviceAttributes);
		env->DeleteLocalRef(jAudioDeviceAttributes);
		}
		return AUDIO_JAVA_SUCCESS;
		}

		static jint
		android_media_AudioSystem_getDevicesForAttributes(JNIEnv *env, jobject thiz,
		jobject jaa, jobjectArray jDeviceArray)
		@@ -2559,6 +2632,16 @@ static const JNINativeMethod gMethods[] =
		(void *)android_media_AudioSystem_removeDevicesRoleForStrategy},
		{"getDevicesForRoleAndStrategy", "(IILjava/util/List;)I",
		(void *)android_media_AudioSystem_getDevicesForRoleAndStrategy},
		{"setDevicesRoleForCapturePreset", "(II[I[Ljava/lang/String;)I",
		(void *)android_media_AudioSystem_setDevicesRoleForCapturePreset},
		{"addDevicesRoleForCapturePreset", "(II[I[Ljava/lang/String;)I",
		(void *)android_media_AudioSystem_addDevicesRoleForCapturePreset},
		{"removeDevicesRoleForCapturePreset", "(II[I[Ljava/lang/String;)I",
		(void *)android_media_AudioSystem_removeDevicesRoleForCapturePreset},
		{"clearDevicesRoleForCapturePreset", "(II)I",
		(void *)android_media_AudioSystem_clearDevicesRoleForCapturePreset},
		{"getDevicesForRoleAndCapturePreset", "(IILjava/util/List;)I",
		(void *)android_media_AudioSystem_getDevicesForRoleAndCapturePreset},
		{"getDevicesForAttributes",
		"(Landroid/media/AudioAttributes;[Landroid/media/AudioDeviceAttributes;)I",
		(void *)android_media_AudioSystem_getDevicesForAttributes},

media/java/android/media/AudioDeviceAttributes.java

+23 −2

Original line number	Diff line number	Diff line
		@@ -71,6 +71,11 @@ public final class AudioDeviceAttributes implements Parcelable {
		*/
		private final @Role int mRole;

		/**
		* The internal audio device type
		*/
		private final int mNativeType;

		/**
		* @hide
		* Constructor from a valid {@link AudioDeviceInfo}
		@@ -83,6 +88,7 @@ public final class AudioDeviceAttributes implements Parcelable {
		mRole = deviceInfo.isSink() ? ROLE_OUTPUT : ROLE_INPUT;
		mType = deviceInfo.getType();
		mAddress = deviceInfo.getAddress();
		mNativeType = deviceInfo.getInternalType();
		}

		/**
		@@ -101,9 +107,12 @@ public final class AudioDeviceAttributes implements Parcelable {
		}
		if (role == ROLE_OUTPUT) {
		AudioDeviceInfo.enforceValidAudioDeviceTypeOut(type);
		}
		if (role == ROLE_INPUT) {
		mNativeType = AudioDeviceInfo.convertDeviceTypeToInternalDevice(type);
		} else if (role == ROLE_INPUT) {
		AudioDeviceInfo.enforceValidAudioDeviceTypeIn(type);
		mNativeType = AudioDeviceInfo.convertDeviceTypeToInternalInputDevice(type);
		} else {
		mNativeType = AudioSystem.DEVICE_NONE;
		}

		mRole = role;
		@@ -115,6 +124,7 @@ public final class AudioDeviceAttributes implements Parcelable {
		mRole = (nativeType & AudioSystem.DEVICE_BIT_IN) != 0 ? ROLE_INPUT : ROLE_OUTPUT;
		mType = AudioDeviceInfo.convertInternalDeviceToDeviceType(nativeType);
		mAddress = address;
		mNativeType = nativeType;
		}

		/**
		@@ -147,6 +157,15 @@ public final class AudioDeviceAttributes implements Parcelable {
		return mAddress;
		}

		/**
		* @hide
		* Returns the internal device type of a device
		* @return the internal device type
		*/
		public int getInternalType() {
		return mNativeType;
		}

		@Override
		public int hashCode() {
		return Objects.hash(mRole, mType, mAddress);
		@@ -189,12 +208,14 @@ public final class AudioDeviceAttributes implements Parcelable {
		dest.writeInt(mRole);
		dest.writeInt(mType);
		dest.writeString(mAddress);
		dest.writeInt(mNativeType);
		}

		private AudioDeviceAttributes(@NonNull Parcel in) {
		mRole = in.readInt();
		mType = in.readInt();
		mAddress = in.readString();
		mNativeType = in.readInt();
		}

		public static final @NonNull Parcelable.Creator<AudioDeviceAttributes> CREATOR =

media/java/android/media/AudioDeviceInfo.java

+45 −0

Original line number	Diff line number	Diff line
		@@ -349,6 +349,14 @@ public final class AudioDeviceInfo {
		return mPort;
		}

		/**
		* @hide
		* @return the internal device tyoe
		*/
		public int getInternalType() {
		return mPort.type();
		}

		/**
		* @return The internal device ID.
		*/
		@@ -512,10 +520,21 @@ public final class AudioDeviceInfo {
		return INT_TO_EXT_DEVICE_MAPPING.get(intDevice, TYPE_UNKNOWN);
		}

		/** @hide */
		public static int convertDeviceTypeToInternalInputDevice(int deviceType) {
		return EXT_TO_INT_INPUT_DEVICE_MAPPING.get(deviceType, AudioSystem.DEVICE_NONE);
		}

		private static final SparseIntArray INT_TO_EXT_DEVICE_MAPPING;

		private static final SparseIntArray EXT_TO_INT_DEVICE_MAPPING;

		/**
		* EXT_TO_INT_INPUT_DEVICE_MAPPING aims at mapping external device type to internal input device
		* type.
		*/
		private static final SparseIntArray EXT_TO_INT_INPUT_DEVICE_MAPPING;

		static {
		INT_TO_EXT_DEVICE_MAPPING = new SparseIntArray();
		INT_TO_EXT_DEVICE_MAPPING.put(AudioSystem.DEVICE_OUT_EARPIECE, TYPE_BUILTIN_EARPIECE);
		@@ -600,6 +619,32 @@ public final class AudioDeviceInfo {
		EXT_TO_INT_DEVICE_MAPPING.put(TYPE_REMOTE_SUBMIX, AudioSystem.DEVICE_OUT_REMOTE_SUBMIX);
		EXT_TO_INT_DEVICE_MAPPING.put(TYPE_BLE_HEADSET, AudioSystem.DEVICE_OUT_BLE_HEADSET);
		EXT_TO_INT_DEVICE_MAPPING.put(TYPE_BLE_SPEAKER, AudioSystem.DEVICE_OUT_BLE_SPEAKER);

		// privileges mapping to input device
		EXT_TO_INT_INPUT_DEVICE_MAPPING = new SparseIntArray();
		EXT_TO_INT_INPUT_DEVICE_MAPPING.put(TYPE_BUILTIN_MIC, AudioSystem.DEVICE_IN_BUILTIN_MIC);
		EXT_TO_INT_INPUT_DEVICE_MAPPING.put(
		TYPE_BLUETOOTH_SCO, AudioSystem.DEVICE_IN_BLUETOOTH_SCO_HEADSET);
		EXT_TO_INT_INPUT_DEVICE_MAPPING.put(
		TYPE_WIRED_HEADSET, AudioSystem.DEVICE_IN_WIRED_HEADSET);
		EXT_TO_INT_INPUT_DEVICE_MAPPING.put(TYPE_HDMI, AudioSystem.DEVICE_IN_HDMI);
		EXT_TO_INT_INPUT_DEVICE_MAPPING.put(TYPE_TELEPHONY, AudioSystem.DEVICE_IN_TELEPHONY_RX);
		EXT_TO_INT_INPUT_DEVICE_MAPPING.put(TYPE_DOCK, AudioSystem.DEVICE_IN_ANLG_DOCK_HEADSET);
		EXT_TO_INT_INPUT_DEVICE_MAPPING.put(
		TYPE_USB_ACCESSORY, AudioSystem.DEVICE_IN_USB_ACCESSORY);
		EXT_TO_INT_INPUT_DEVICE_MAPPING.put(TYPE_USB_DEVICE, AudioSystem.DEVICE_IN_USB_DEVICE);
		EXT_TO_INT_INPUT_DEVICE_MAPPING.put(TYPE_USB_HEADSET, AudioSystem.DEVICE_IN_USB_HEADSET);
		EXT_TO_INT_INPUT_DEVICE_MAPPING.put(TYPE_FM_TUNER, AudioSystem.DEVICE_IN_FM_TUNER);
		EXT_TO_INT_INPUT_DEVICE_MAPPING.put(TYPE_TV_TUNER, AudioSystem.DEVICE_IN_TV_TUNER);
		EXT_TO_INT_INPUT_DEVICE_MAPPING.put(TYPE_LINE_ANALOG, AudioSystem.DEVICE_IN_LINE);
		EXT_TO_INT_INPUT_DEVICE_MAPPING.put(TYPE_LINE_DIGITAL, AudioSystem.DEVICE_IN_SPDIF);
		EXT_TO_INT_INPUT_DEVICE_MAPPING.put(
		TYPE_BLUETOOTH_A2DP, AudioSystem.DEVICE_IN_BLUETOOTH_A2DP);
		EXT_TO_INT_INPUT_DEVICE_MAPPING.put(TYPE_IP, AudioSystem.DEVICE_IN_IP);
		EXT_TO_INT_INPUT_DEVICE_MAPPING.put(TYPE_BUS, AudioSystem.DEVICE_IN_BUS);
		EXT_TO_INT_INPUT_DEVICE_MAPPING.put(
		TYPE_REMOTE_SUBMIX, AudioSystem.DEVICE_IN_REMOTE_SUBMIX);
		EXT_TO_INT_INPUT_DEVICE_MAPPING.put(TYPE_BLE_HEADSET, AudioSystem.DEVICE_IN_BLE_HEADSET);
		}
		}

media/java/android/media/AudioManager.java

+343 −0

File changed.

Preview size limit exceeded, changes collapsed.