Bluetooth: Audio Squashed gerrits for propagation (2191ff96) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioManager.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2392,6 +2392,7 @@ public class AudioManager {
	}		}
	// construct a PendingIntent for the media button and register it		// construct a PendingIntent for the media button and register it
	Intent mediaButtonIntent = new Intent(Intent.ACTION_MEDIA_BUTTON);		Intent mediaButtonIntent = new Intent(Intent.ACTION_MEDIA_BUTTON);
			mediaButtonIntent.addFlags(mediaButtonIntent.FLAG_RECEIVER_FOREGROUND);
	// the associated intent will be handled by the component being registered		// the associated intent will be handled by the component being registered
	mediaButtonIntent.setComponent(eventReceiver);		mediaButtonIntent.setComponent(eventReceiver);
	PendingIntent pi = PendingIntent.getBroadcast(mContext,		PendingIntent pi = PendingIntent.getBroadcast(mContext,

media/java/android/media/AudioService.java

+31 −29

Original line number	Original line	Diff line number	Diff line
	@@ -2555,17 +2555,14 @@ public class AudioService extends IAudioService.Stub {
	}		}
	}		}
	if (mBluetoothHeadset != null && mBluetoothHeadsetDevice != null) {		if (mBluetoothHeadset != null && mBluetoothHeadsetDevice != null) {
	boolean status = false;		boolean status;
	if (mScoAudioMode == SCO_MODE_RAW) {		if (mScoAudioMode == SCO_MODE_VR) {
	status = mBluetoothHeadset.connectAudio();
	} else if (mScoAudioMode == SCO_MODE_VIRTUAL_CALL) {
	status = mBluetoothHeadset.startScoUsingVirtualVoiceCall(
	mBluetoothHeadsetDevice);
	} else if (mScoAudioMode == SCO_MODE_VR) {
	status = mBluetoothHeadset.startVoiceRecognition(		status = mBluetoothHeadset.startVoiceRecognition(
	mBluetoothHeadsetDevice);		mBluetoothHeadsetDevice);
			} else {
			status = mBluetoothHeadset.startScoUsingVirtualVoiceCall(
			mBluetoothHeadsetDevice);
	}		}

	if (status) {		if (status) {
	mScoAudioState = SCO_STATE_ACTIVE_INTERNAL;		mScoAudioState = SCO_STATE_ACTIVE_INTERNAL;
	} else {		} else {
	@@ -2588,15 +2585,13 @@ public class AudioService extends IAudioService.Stub {
	mScoAudioState == SCO_STATE_ACTIVATE_REQ)) {		mScoAudioState == SCO_STATE_ACTIVATE_REQ)) {
	if (mScoAudioState == SCO_STATE_ACTIVE_INTERNAL) {		if (mScoAudioState == SCO_STATE_ACTIVE_INTERNAL) {
	if (mBluetoothHeadset != null && mBluetoothHeadsetDevice != null) {		if (mBluetoothHeadset != null && mBluetoothHeadsetDevice != null) {
	boolean status = false;		boolean status;
	if (mScoAudioMode == SCO_MODE_RAW) {		if (mScoAudioMode == SCO_MODE_VR) {
	status = mBluetoothHeadset.disconnectAudio();
	} else if (mScoAudioMode == SCO_MODE_VIRTUAL_CALL) {
	status = mBluetoothHeadset.stopScoUsingVirtualVoiceCall(
	mBluetoothHeadsetDevice);
	} else if (mScoAudioMode == SCO_MODE_VR) {
	status = mBluetoothHeadset.stopVoiceRecognition(		status = mBluetoothHeadset.stopVoiceRecognition(
	mBluetoothHeadsetDevice);		mBluetoothHeadsetDevice);
			} else {
			status = mBluetoothHeadset.stopScoUsingVirtualVoiceCall(
			mBluetoothHeadsetDevice);
	}		}

	if (!status) {		if (!status) {
	@@ -2790,25 +2785,21 @@ public class AudioService extends IAudioService.Stub {
	switch (mScoAudioState) {		switch (mScoAudioState) {
	case SCO_STATE_ACTIVATE_REQ:		case SCO_STATE_ACTIVATE_REQ:
	mScoAudioState = SCO_STATE_ACTIVE_INTERNAL;		mScoAudioState = SCO_STATE_ACTIVE_INTERNAL;
	if (mScoAudioMode == SCO_MODE_RAW) {		if (mScoAudioMode == SCO_MODE_VR) {
	status = mBluetoothHeadset.connectAudio();
	} else if (mScoAudioMode == SCO_MODE_VIRTUAL_CALL) {
	status = mBluetoothHeadset.startScoUsingVirtualVoiceCall(
	mBluetoothHeadsetDevice);
	} else if (mScoAudioMode == SCO_MODE_VR) {
	status = mBluetoothHeadset.startVoiceRecognition(		status = mBluetoothHeadset.startVoiceRecognition(
	mBluetoothHeadsetDevice);		mBluetoothHeadsetDevice);
			} else {
			status = mBluetoothHeadset.startScoUsingVirtualVoiceCall(
			mBluetoothHeadsetDevice);
	}		}
	break;		break;
	case SCO_STATE_DEACTIVATE_REQ:		case SCO_STATE_DEACTIVATE_REQ:
	if (mScoAudioMode == SCO_MODE_RAW) {		if (mScoAudioMode == SCO_MODE_VR) {
	status = mBluetoothHeadset.disconnectAudio();
	} else if (mScoAudioMode == SCO_MODE_VIRTUAL_CALL) {
	status = mBluetoothHeadset.stopScoUsingVirtualVoiceCall(
	mBluetoothHeadsetDevice);
	} else if (mScoAudioMode == SCO_MODE_VR) {
	status = mBluetoothHeadset.stopVoiceRecognition(		status = mBluetoothHeadset.stopVoiceRecognition(
	mBluetoothHeadsetDevice);		mBluetoothHeadsetDevice);
			} else {
			status = mBluetoothHeadset.stopScoUsingVirtualVoiceCall(
			mBluetoothHeadsetDevice);
	}		}
	break;		break;
	case SCO_STATE_DEACTIVATE_EXT_REQ:		case SCO_STATE_DEACTIVATE_EXT_REQ:
	@@ -2829,14 +2820,25 @@ public class AudioService extends IAudioService.Stub {
	}		}
	}		}
	public void onServiceDisconnected(int profile) {		public void onServiceDisconnected(int profile) {
			Log.d(TAG, "onServiceDisconnected: Bluetooth profile: " + profile);
	switch(profile) {		switch(profile) {
	case BluetoothProfile.A2DP:		case BluetoothProfile.A2DP:
	synchronized (mA2dpAvrcpLock) {		synchronized (mA2dpAvrcpLock) {
	mA2dp = null;		mA2dp = null;
	synchronized (mConnectedDevices) {		synchronized (mConnectedDevices) {
	if (mConnectedDevices.containsKey(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP)) {		if (mConnectedDevices.containsKey(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP)) {
	makeA2dpDeviceUnavailableNow(		Log.d(TAG, "A2dp service disconnects, pause music player");
	mConnectedDevices.get(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP));		BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
			BluetoothDevice btDevice = adapter.getRemoteDevice
			(mConnectedDevices.get(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP));
			int delay = checkSendBecomingNoisyIntent(
			AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP, 0);
			queueMsgUnderWakeLock(mAudioHandler,
			MSG_SET_A2DP_SRC_CONNECTION_STATE,
			BluetoothA2dp.STATE_DISCONNECTED,
			0,
			btDevice,
			delay);
	}		}
	}		}
	}		}

media/java/android/media/MediaMetadataEditor.java

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -439,7 +439,7 @@ import android.util.SparseIntArray;
	protected static final SparseIntArray METADATA_KEYS_TYPE;		protected static final SparseIntArray METADATA_KEYS_TYPE;

	static {		static {
	METADATA_KEYS_TYPE = new SparseIntArray(17);		METADATA_KEYS_TYPE = new SparseIntArray(18);
	// NOTE: if adding to the list below, make sure you increment the array initialization size		// NOTE: if adding to the list below, make sure you increment the array initialization size
	// keys with long values		// keys with long values
	METADATA_KEYS_TYPE.put(		METADATA_KEYS_TYPE.put(
	@@ -465,5 +465,7 @@ import android.util.SparseIntArray;
	// keys with Rating values		// keys with Rating values
	METADATA_KEYS_TYPE.put(RATING_KEY_BY_OTHERS, METADATA_TYPE_RATING);		METADATA_KEYS_TYPE.put(RATING_KEY_BY_OTHERS, METADATA_TYPE_RATING);
	METADATA_KEYS_TYPE.put(RATING_KEY_BY_USER, METADATA_TYPE_RATING);		METADATA_KEYS_TYPE.put(RATING_KEY_BY_USER, METADATA_TYPE_RATING);
			// Meta data for total number of tracks in Album
			METADATA_KEYS_TYPE.put(MediaMetadataRetriever.METADATA_KEY_NUM_TRACKS, METADATA_TYPE_LONG);
	}		}
	}		}