Merge "Introduce device(s) role for strategy." (7f73ba81) · Commits · e / os / android_frameworks_base

config/preloaded-classes

+3 −3

Original line number	Diff line number	Diff line
		@@ -3716,9 +3716,9 @@ android.media.IRemoteVolumeObserver
		android.media.IRingtonePlayer$Stub$Proxy
		android.media.IRingtonePlayer$Stub
		android.media.IRingtonePlayer
		android.media.IStrategyPreferredDeviceDispatcher$Stub$Proxy
		android.media.IStrategyPreferredDeviceDispatcher$Stub
		android.media.IStrategyPreferredDeviceDispatcher
		android.media.IStrategyPreferredDevicesDispatcher$Stub$Proxy
		android.media.IStrategyPreferredDevicesDispatcher$Stub
		android.media.IStrategyPreferredDevicesDispatcher
		android.media.IVolumeController$Stub$Proxy
		android.media.IVolumeController$Stub
		android.media.IVolumeController

core/api/system-current.txt

+12 −4

Original line number	Diff line number	Diff line
		@@ -4145,7 +4145,8 @@ package android.media {

		public class AudioManager {
		method @Deprecated public int abandonAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener, android.media.AudioAttributes);
		method @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 @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 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 int dispatchAudioFocusChange(@NonNull android.media.AudioFocusInfo, int, @NonNull android.media.audiopolicy.AudioPolicy);
		method @IntRange(from=0) public long getAdditionalOutputDeviceDelay(@NonNull android.media.AudioDeviceInfo);
		@@ -4156,13 +4157,15 @@ 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> 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);
		method public boolean isAudioServerRunning();
		method public boolean isHdmiSystemAudioSupported();
		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 @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void removeOnPreferredDeviceForStrategyChangedListener(@NonNull android.media.AudioManager.OnPreferredDeviceForStrategyChangedListener);
		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 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;
		method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.MODIFY_AUDIO_ROUTING}) public int requestAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener, @NonNull android.media.AudioAttributes, int, int, android.media.audiopolicy.AudioPolicy) throws java.lang.IllegalArgumentException;
		@@ -4171,6 +4174,7 @@ package android.media {
		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 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[]);
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void setVolumeIndexForAttributes(@NonNull android.media.AudioAttributes, int, int);
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void unregisterAudioPolicy(@NonNull android.media.audiopolicy.AudioPolicy);
		@@ -4189,8 +4193,12 @@ package android.media {
		method public void onAudioServerUp();
		}

		public static interface AudioManager.OnPreferredDeviceForStrategyChangedListener {
		method public void onPreferredDeviceForStrategyChanged(@NonNull android.media.audiopolicy.AudioProductStrategy, @Nullable android.media.AudioDeviceAttributes);
		@Deprecated public static interface AudioManager.OnPreferredDeviceForStrategyChangedListener {
		method @Deprecated public void onPreferredDeviceForStrategyChanged(@NonNull android.media.audiopolicy.AudioProductStrategy, @Nullable android.media.AudioDeviceAttributes);
		}

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

		public abstract static class AudioManager.VolumeGroupCallback {

core/api/test-current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -871,6 +871,9 @@ package android.media {
		method public static float getMasterBalance();
		method public static final int getNumStreamTypes();
		method public static int setMasterBalance(float);
		field public static final int DEVICE_ROLE_DISABLED = 2; // 0x2
		field public static final int DEVICE_ROLE_NONE = 0; // 0x0
		field public static final int DEVICE_ROLE_PREFERRED = 1; // 0x1
		field public static final int STREAM_DEFAULT = -1; // 0xffffffff
		}

core/jni/android_media_AudioDeviceAttributes.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ jint createAudioDeviceAttributesFromNative(JNIEnv env, jobject jAudioDeviceAtt
		const AudioDeviceTypeAddr *devTypeAddr) {
		jint jStatus = (jint)AUDIO_JAVA_SUCCESS;
		jint jNativeType = (jint)devTypeAddr->mType;
		ScopedLocalRef<jstring> jAddress(env, env->NewStringUTF(devTypeAddr->mAddress.data()));
		ScopedLocalRef<jstring> jAddress(env, env->NewStringUTF(devTypeAddr->getAddress()));

		*jAudioDeviceAttributes = env->NewObject(gAudioDeviceAttributesClass, gAudioDeviceAttributesCstor,
		jNativeType, jAddress.get());

core/jni/android_media_AudioSystem.cpp

+42 −37

Original line number	Diff line number	Diff line
		@@ -172,6 +172,8 @@ static struct {
		jmethodID postRecordConfigEventFromNative;
		} gAudioPolicyEventHandlerMethods;

		static struct { jmethodID add; } gListMethods;

		//
		// JNI Initialization for OpenSLES routing
		//
		@@ -2362,49 +2364,49 @@ android_media_AudioSystem_isCallScreeningModeSupported(JNIEnv *env, jobject thiz
		return AudioSystem::isCallScreenModeSupported();
		}

		static jint
		android_media_AudioSystem_setPreferredDeviceForStrategy(JNIEnv *env, jobject thiz,
		jint strategy, jint deviceType, jstring deviceAddress) {

		const char *c_address = env->GetStringUTFChars(deviceAddress, NULL);
		static jint android_media_AudioSystem_setDevicesRoleForStrategy(JNIEnv *env, jobject thiz,
		jint strategy, 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::setPreferredDeviceForStrategy((product_strategy_t)strategy,
		AudioDeviceTypeAddr((audio_devices_t)
		deviceType,
		c_address)));
		env->ReleaseStringUTFChars(deviceAddress, c_address);
		AudioSystem::setDevicesRoleForStrategy((product_strategy_t)strategy,
		(device_role_t)role, nDevices));
		return (jint) status;
		}

		static jint
		android_media_AudioSystem_removePreferredDeviceForStrategy(JNIEnv *env, jobject thiz, jint strategy)
		{
		static jint android_media_AudioSystem_removeDevicesRoleForStrategy(JNIEnv *env, jobject thiz,
		jint strategy, jint role) {
		return (jint)check_AudioSystem_Command(
		AudioSystem::removePreferredDeviceForStrategy((product_strategy_t) strategy));
		AudioSystem::removeDevicesRoleForStrategy((product_strategy_t)strategy,
		(device_role_t)role));
		}

		static jint
		android_media_AudioSystem_getPreferredDeviceForStrategy(JNIEnv *env, jobject thiz,
		jint strategy, jobjectArray jDeviceArray)
		{
		if (jDeviceArray == nullptr \|\| env->GetArrayLength(jDeviceArray) != 1) {
		ALOGE("%s invalid array to store AudioDeviceAttributes", __FUNCTION__);
		return (jint)AUDIO_JAVA_BAD_VALUE;
		}

		AudioDeviceTypeAddr elDevice;
		static jint android_media_AudioSystem_getDevicesForRoleAndStrategy(JNIEnv *env, jobject thiz,
		jint strategy, jint role,
		jobject jDevices) {
		AudioDeviceTypeAddrVector nDevices;
		status_t status = check_AudioSystem_Command(
		AudioSystem::getPreferredDeviceForStrategy((product_strategy_t) strategy, elDevice));
		AudioSystem::getDevicesForRoleAndStrategy((product_strategy_t)strategy,
		(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, &elDevice);
		if (jStatus == AUDIO_JAVA_SUCCESS) {
		env->SetObjectArrayElement(jDeviceArray, 0, jAudioDeviceAttributes);
		}
		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,
		@@ -2551,12 +2553,12 @@ static const JNINativeMethod gMethods[] =
		{"setAudioHalPids", "([I)I", (void *)android_media_AudioSystem_setAudioHalPids},
		{"isCallScreeningModeSupported", "()Z",
		(void *)android_media_AudioSystem_isCallScreeningModeSupported},
		{"setPreferredDeviceForStrategy", "(IILjava/lang/String;)I",
		(void *)android_media_AudioSystem_setPreferredDeviceForStrategy},
		{"removePreferredDeviceForStrategy", "(I)I",
		(void *)android_media_AudioSystem_removePreferredDeviceForStrategy},
		{"getPreferredDeviceForStrategy", "(I[Landroid/media/AudioDeviceAttributes;)I",
		(void *)android_media_AudioSystem_getPreferredDeviceForStrategy},
		{"setDevicesRoleForStrategy", "(II[I[Ljava/lang/String;)I",
		(void *)android_media_AudioSystem_setDevicesRoleForStrategy},
		{"removeDevicesRoleForStrategy", "(II)I",
		(void *)android_media_AudioSystem_removeDevicesRoleForStrategy},
		{"getDevicesForRoleAndStrategy", "(IILjava/util/List;)I",
		(void *)android_media_AudioSystem_getDevicesForRoleAndStrategy},
		{"getDevicesForAttributes",
		"(Landroid/media/AudioAttributes;[Landroid/media/AudioDeviceAttributes;)I",
		(void *)android_media_AudioSystem_getDevicesForAttributes},
		@@ -2758,6 +2760,9 @@ int register_android_media_AudioSystem(JNIEnv *env)
		gMidAudioRecordRoutingProxy_release =
		android::GetMethodIDOrDie(env, gClsAudioRecordRoutingProxy, "native_release", "()V");

		jclass listClass = FindClassOrDie(env, "java/util/List");
		gListMethods.add = GetMethodIDOrDie(env, listClass, "add", "(Ljava/lang/Object;)Z");

		AudioSystem::addErrorCallback(android_media_AudioSystem_error_callback);

		RegisterMethodsOrDie(env, kClassPathName, gMethods, NELEM(gMethods));