Merge "Select a system audio route only when needed" into oc-mr1-dev am: d4aee713d4 (65a5d03b) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaRouter.java

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -204,7 +204,6 @@ public class MediaRouter {
	audioRoutesChanged = true;		audioRoutesChanged = true;
	}		}

	final int mainType = mCurAudioRoutesInfo.mainType;
	if (!TextUtils.equals(newRoutes.bluetoothName, mCurAudioRoutesInfo.bluetoothName)) {		if (!TextUtils.equals(newRoutes.bluetoothName, mCurAudioRoutesInfo.bluetoothName)) {
	mCurAudioRoutesInfo.bluetoothName = newRoutes.bluetoothName;		mCurAudioRoutesInfo.bluetoothName = newRoutes.bluetoothName;
	if (mCurAudioRoutesInfo.bluetoothName != null) {		if (mCurAudioRoutesInfo.bluetoothName != null) {
	@@ -231,8 +230,11 @@ public class MediaRouter {
	}		}

	if (audioRoutesChanged) {		if (audioRoutesChanged) {
	selectRouteStatic(ROUTE_TYPE_LIVE_AUDIO, getDefaultSystemAudioRoute(), false);
	Log.v(TAG, "Audio routes updated: " + newRoutes + ", a2dp=" + isBluetoothA2dpOn());		Log.v(TAG, "Audio routes updated: " + newRoutes + ", a2dp=" + isBluetoothA2dpOn());
			if (mSelectedRoute == null \|\| mSelectedRoute == mDefaultAudioVideo
			\|\| mSelectedRoute == mBluetoothA2dpRoute) {
			selectRouteStatic(ROUTE_TYPE_LIVE_AUDIO, getDefaultSystemAudioRoute(), false);
			}
	}		}
	}		}