Merge "Add additional info to AudioPort for enum/selection API." (26bf3ea5) · Commits · e / os / android_frameworks_base

core/java/android/alsa/AlsaCardsParser.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -80,8 +80,11 @@ public class AlsaCardsParser {
		} else if (lineIndex == 1) {
		tokenIndex = mTokenizer.nextToken(line, 0);
		if (tokenIndex != -1) {
		mCardDescription = line.substring(tokenIndex);
		mIsUsb = mCardDescription.contains(kUsbCardKeyStr);
		int keyIndex = line.indexOf(kUsbCardKeyStr);
		mIsUsb = keyIndex != -1;
		if (mIsUsb) {
		mCardDescription = line.substring(tokenIndex, keyIndex - 1);
		}
		}
		}

core/jni/android_media_AudioSystem.cpp

+20 −10

Original line number	Diff line number	Diff line
		@@ -338,13 +338,15 @@ android_media_AudioSystem_error_callback(status_t err)
		}

		static jint
		android_media_AudioSystem_setDeviceConnectionState(JNIEnv *env, jobject thiz, jint device, jint state, jstring device_address)
		android_media_AudioSystem_setDeviceConnectionState(JNIEnv *env, jobject thiz, jint device, jint state, jstring device_address, jstring device_name)
		{
		const char *c_address = env->GetStringUTFChars(device_address, NULL);
		const char *c_name = env->GetStringUTFChars(device_name, NULL);
		int status = check_AudioSystem_Command(AudioSystem::setDeviceConnectionState(static_cast <audio_devices_t>(device),
		static_cast <audio_policy_dev_state_t>(state),
		c_address));
		c_address, c_name));
		env->ReleaseStringUTFChars(device_address, c_address);
		env->ReleaseStringUTFChars(device_name, c_name);
		return (jint) status;
		}

		@@ -788,10 +790,11 @@ static jint convertAudioPortFromNative(JNIEnv *env,
		jintArray jFormats = NULL;
		jobjectArray jGains = NULL;
		jobject jHandle = NULL;
		jstring jDeviceName = NULL;
		bool useInMask;

		ALOGV("convertAudioPortFromNative id %d role %d type %d",
		nAudioPort->id, nAudioPort->role, nAudioPort->type);
		ALOGV("convertAudioPortFromNative id %d role %d type %d name %s",
		nAudioPort->id, nAudioPort->role, nAudioPort->type, nAudioPort->name);

		jSamplingRates = env->NewIntArray(nAudioPort->num_sample_rates);
		if (jSamplingRates == NULL) {
		@@ -871,17 +874,21 @@ static jint convertAudioPortFromNative(JNIEnv *env,
		goto exit;
		}

		jDeviceName = env->NewStringUTF(nAudioPort->name);

		if (nAudioPort->type == AUDIO_PORT_TYPE_DEVICE) {
		ALOGV("convertAudioPortFromNative is a device %08x", nAudioPort->ext.device.type);
		jstring jAddress = env->NewStringUTF(nAudioPort->ext.device.address);
		*jAudioPort = env->NewObject(gAudioDevicePortClass, gAudioDevicePortCstor,
		jHandle, jSamplingRates, jChannelMasks, jFormats, jGains,
		jHandle, jDeviceName,
		jSamplingRates, jChannelMasks, jFormats, jGains,
		nAudioPort->ext.device.type, jAddress);
		env->DeleteLocalRef(jAddress);
		} else if (nAudioPort->type == AUDIO_PORT_TYPE_MIX) {
		ALOGV("convertAudioPortFromNative is a mix");
		*jAudioPort = env->NewObject(gAudioMixPortClass, gAudioMixPortCstor,
		jHandle, nAudioPort->role, jSamplingRates, jChannelMasks,
		jHandle, nAudioPort->role, jDeviceName,
		jSamplingRates, jChannelMasks,
		jFormats, jGains);
		} else {
		ALOGE("convertAudioPortFromNative unknown nAudioPort type %d", nAudioPort->type);
		@@ -905,6 +912,9 @@ static jint convertAudioPortFromNative(JNIEnv *env,
		env->SetObjectField(*jAudioPort, gAudioPortFields.mActiveConfig, jAudioPortConfig);

		exit:
		if (jDeviceName != NULL) {
		env->DeleteLocalRef(jDeviceName);
		}
		if (jSamplingRates != NULL) {
		env->DeleteLocalRef(jSamplingRates);
		}
		@@ -1496,7 +1506,7 @@ static JNINativeMethod gMethods[] = {
		{"isStreamActiveRemotely","(II)Z", (void *)android_media_AudioSystem_isStreamActiveRemotely},
		{"isSourceActive", "(I)Z", (void *)android_media_AudioSystem_isSourceActive},
		{"newAudioSessionId", "()I", (void *)android_media_AudioSystem_newAudioSessionId},
		{"setDeviceConnectionState", "(IILjava/lang/String;)I", (void *)android_media_AudioSystem_setDeviceConnectionState},
		{"setDeviceConnectionState", "(IILjava/lang/String;Ljava/lang/String;)I", (void *)android_media_AudioSystem_setDeviceConnectionState},
		{"getDeviceConnectionState", "(ILjava/lang/String;)I", (void *)android_media_AudioSystem_getDeviceConnectionState},
		{"setPhoneState", "(I)I", (void *)android_media_AudioSystem_setPhoneState},
		{"setForceUse", "(II)I", (void *)android_media_AudioSystem_setForceUse},
		@@ -1556,7 +1566,7 @@ int register_android_media_AudioSystem(JNIEnv *env)
		jclass audioPortClass = FindClassOrDie(env, "android/media/AudioPort");
		gAudioPortClass = MakeGlobalRefOrDie(env, audioPortClass);
		gAudioPortCstor = GetMethodIDOrDie(env, audioPortClass, "<init>",
		"(Landroid/media/AudioHandle;I[I[I[I[Landroid/media/AudioGain;)V");
		"(Landroid/media/AudioHandle;ILjava/lang/String;[I[I[I[Landroid/media/AudioGain;)V");
		gAudioPortFields.mHandle = GetFieldIDOrDie(env, audioPortClass, "mHandle",
		"Landroid/media/AudioHandle;");
		gAudioPortFields.mRole = GetFieldIDOrDie(env, audioPortClass, "mRole", "I");
		@@ -1594,12 +1604,12 @@ int register_android_media_AudioSystem(JNIEnv *env)
		jclass audioDevicePortClass = FindClassOrDie(env, "android/media/AudioDevicePort");
		gAudioDevicePortClass = MakeGlobalRefOrDie(env, audioDevicePortClass);
		gAudioDevicePortCstor = GetMethodIDOrDie(env, audioDevicePortClass, "<init>",
		"(Landroid/media/AudioHandle;[I[I[I[Landroid/media/AudioGain;ILjava/lang/String;)V");
		"(Landroid/media/AudioHandle;Ljava/lang/String;[I[I[I[Landroid/media/AudioGain;ILjava/lang/String;)V");

		jclass audioMixPortClass = FindClassOrDie(env, "android/media/AudioMixPort");
		gAudioMixPortClass = MakeGlobalRefOrDie(env, audioMixPortClass);
		gAudioMixPortCstor = GetMethodIDOrDie(env, audioMixPortClass, "<init>",
		"(Landroid/media/AudioHandle;I[I[I[I[Landroid/media/AudioGain;)V");
		"(Landroid/media/AudioHandle;ILjava/lang/String;[I[I[I[Landroid/media/AudioGain;)V");

		jclass audioGainClass = FindClassOrDie(env, "android/media/AudioGain");
		gAudioGainClass = MakeGlobalRefOrDie(env, audioGainClass);

media/java/android/media/AudioDevicePort.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -36,12 +36,13 @@ public class AudioDevicePort extends AudioPort {
		private final int mType;
		private final String mAddress;

		AudioDevicePort(AudioHandle handle, int[] samplingRates, int[] channelMasks,
		AudioDevicePort(AudioHandle handle, String deviceName,
		int[] samplingRates, int[] channelMasks,
		int[] formats, AudioGain[] gains, int type, String address) {
		super(handle,
		(AudioManager.isInputDevice(type) == true) ?
		AudioPort.ROLE_SOURCE : AudioPort.ROLE_SINK,
		samplingRates, channelMasks, formats, gains);
		deviceName, samplingRates, channelMasks, formats, gains);
		mType = type;
		mAddress = address;
		}

media/java/android/media/AudioManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -3199,10 +3199,10 @@ public class AudioManager {
		* @param name device name
		* {@hide}
		*/
		public void setWiredDeviceConnectionState(int device, int state, String name) {
		public void setWiredDeviceConnectionState(int type, int state, String address, String name) {
		IAudioService service = getService();
		try {
		service.setWiredDeviceConnectionState(device, state, name);
		service.setWiredDeviceConnectionState(type, state, address, name);
		} catch (RemoteException e) {
		Log.e(TAG, "Dead object in setWiredDeviceConnectionState "+e);
		}

media/java/android/media/AudioMixPort.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -26,9 +26,10 @@ package android.media;

		public class AudioMixPort extends AudioPort {

		AudioMixPort(AudioHandle handle, int role, int[] samplingRates, int[] channelMasks,
		AudioMixPort(AudioHandle handle, int role, String deviceName,
		int[] samplingRates, int[] channelMasks,
		int[] formats, AudioGain[] gains) {
		super(handle, role, samplingRates, channelMasks, formats, gains);
		super(handle, role, deviceName, samplingRates, channelMasks, formats, gains);
		}

		/**