Merge "Set the type of system routes" into rvc-dev (71c824f9) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/media/BluetoothRouteProvider.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -215,7 +215,6 @@ class BluetoothRouteProvider {
		.setConnectionState(MediaRoute2Info.CONNECTION_STATE_DISCONNECTED)
		.setDescription(mContext.getResources().getText(
		R.string.bluetooth_a2dp_audio_route_name).toString())
		//TODO: Set type correctly (BLUETOOTH_A2DP or HEARING_AID)
		.setType(MediaRoute2Info.TYPE_BLUETOOTH_A2DP)
		.setVolumeHandling(MediaRoute2Info.PLAYBACK_VOLUME_VARIABLE)
		.build();
		@@ -236,6 +235,8 @@ class BluetoothRouteProvider {
		// Update volume when the connection state is changed.
		MediaRoute2Info.Builder builder = new MediaRoute2Info.Builder(btRoute.route)
		.setConnectionState(state);
		builder.setType(btRoute.connectedProfiles.get(BluetoothProfile.HEARING_AID, false)
		? MediaRoute2Info.TYPE_HEARING_AID : MediaRoute2Info.TYPE_BLUETOOTH_A2DP);

		if (state == MediaRoute2Info.CONNECTION_STATE_CONNECTED) {
		int maxVolume = mAudioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);

services/core/java/com/android/server/media/SystemMediaRoute2Provider.java

+16 −4

Original line number	Diff line number	Diff line
		@@ -19,6 +19,11 @@ package com.android.server.media;
		import static android.media.MediaRoute2Info.FEATURE_LIVE_AUDIO;
		import static android.media.MediaRoute2Info.FEATURE_LIVE_VIDEO;
		import static android.media.MediaRoute2Info.TYPE_BUILTIN_SPEAKER;
		import static android.media.MediaRoute2Info.TYPE_DOCK;
		import static android.media.MediaRoute2Info.TYPE_HDMI;
		import static android.media.MediaRoute2Info.TYPE_USB_DEVICE;
		import static android.media.MediaRoute2Info.TYPE_WIRED_HEADPHONES;
		import static android.media.MediaRoute2Info.TYPE_WIRED_HEADSET;

		import android.content.BroadcastReceiver;
		import android.content.ComponentName;
		@@ -194,19 +199,27 @@ class SystemMediaRoute2Provider extends MediaRoute2Provider {

		private void updateDeviceRoute(AudioRoutesInfo newRoutes) {
		int name = R.string.default_audio_route_name;
		int type = TYPE_BUILTIN_SPEAKER;
		if (newRoutes != null) {
		mCurAudioRoutesInfo.mainType = newRoutes.mainType;
		if ((newRoutes.mainType & AudioRoutesInfo.MAIN_HEADPHONES) != 0
		\|\| (newRoutes.mainType & AudioRoutesInfo.MAIN_HEADSET) != 0) {
		if ((newRoutes.mainType & AudioRoutesInfo.MAIN_HEADPHONES) != 0) {
		type = TYPE_WIRED_HEADPHONES;
		name = com.android.internal.R.string.default_audio_route_name_headphones;
		} else if ((newRoutes.mainType & AudioRoutesInfo.MAIN_HEADSET) != 0) {
		type = TYPE_WIRED_HEADSET;
		name = com.android.internal.R.string.default_audio_route_name_headphones;
		} else if ((newRoutes.mainType & AudioRoutesInfo.MAIN_DOCK_SPEAKERS) != 0) {
		type = TYPE_DOCK;
		name = com.android.internal.R.string.default_audio_route_name_dock_speakers;
		} else if ((newRoutes.mainType & AudioRoutesInfo.MAIN_HDMI) != 0) {
		type = TYPE_HDMI;
		name = com.android.internal.R.string.default_audio_route_name_hdmi;
		} else if ((newRoutes.mainType & AudioRoutesInfo.MAIN_USB) != 0) {
		type = TYPE_USB_DEVICE;
		name = com.android.internal.R.string.default_audio_route_name_usb;
		}
		}

		mDeviceRoute = new MediaRoute2Info.Builder(
		DEVICE_ROUTE_ID, mContext.getResources().getText(name).toString())
		.setVolumeHandling(mAudioManager.isVolumeFixed()
		@@ -214,8 +227,7 @@ class SystemMediaRoute2Provider extends MediaRoute2Provider {
		: MediaRoute2Info.PLAYBACK_VOLUME_VARIABLE)
		.setVolumeMax(mAudioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC))
		.setVolume(mAudioManager.getStreamVolume(AudioManager.STREAM_MUSIC))
		//TODO: Guess the exact type using AudioDevice
		.setType(TYPE_BUILTIN_SPEAKER)
		.setType(type)
		.addFeature(FEATURE_LIVE_AUDIO)
		.addFeature(FEATURE_LIVE_VIDEO)
		.setConnectionState(MediaRoute2Info.CONNECTION_STATE_CONNECTED)