diff options
| author | 2020-06-22 06:23:42 +0000 | |
|---|---|---|
| committer | 2020-06-22 06:23:42 +0000 | |
| commit | 7bfb0c31bf9fc3ba137ead2a17cd3b2430f6d61b (patch) | |
| tree | 3956aeefe0b1ee708db72b55a0340169d0d626c3 | |
| parent | d531e285069e2a76bd2fc505c4268b6cb862a801 (diff) | |
| parent | 0ea65316f496bdb866a50aaff5cc9f8acfd724e4 (diff) | |
Merge "Prevent unnecessary call of setBluetoothA2dpOn(false)" into rvc-dev
| -rw-r--r-- | media/java/android/media/MediaRouter.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/media/java/android/media/MediaRouter.java b/media/java/android/media/MediaRouter.java index 7ae2949e6074..6fa378724240 100644 --- a/media/java/android/media/MediaRouter.java +++ b/media/java/android/media/MediaRouter.java @@ -221,12 +221,11 @@ public class MediaRouter { if (!TextUtils.equals(newRoutes.bluetoothName, mCurAudioRoutesInfo.bluetoothName)) { forceUseDefaultRoute = false; - mCurAudioRoutesInfo.bluetoothName = newRoutes.bluetoothName; - if (mCurAudioRoutesInfo.bluetoothName != null) { + if (newRoutes.bluetoothName != null) { if (mBluetoothA2dpRoute == null) { // BT connected final RouteInfo info = new RouteInfo(mSystemCategory); - info.mName = mCurAudioRoutesInfo.bluetoothName; + info.mName = newRoutes.bluetoothName; info.mDescription = mResources.getText( com.android.internal.R.string.bluetooth_a2dp_audio_route_name); info.mSupportedTypes = ROUTE_TYPE_LIVE_AUDIO; @@ -234,13 +233,14 @@ public class MediaRouter { mBluetoothA2dpRoute = info; addRouteStatic(mBluetoothA2dpRoute); } else { - mBluetoothA2dpRoute.mName = mCurAudioRoutesInfo.bluetoothName; + mBluetoothA2dpRoute.mName = newRoutes.bluetoothName; dispatchRouteChanged(mBluetoothA2dpRoute); } } else if (mBluetoothA2dpRoute != null) { // BT disconnected - removeRouteStatic(mBluetoothA2dpRoute); + RouteInfo btRoute = mBluetoothA2dpRoute; mBluetoothA2dpRoute = null; + removeRouteStatic(btRoute); } audioRoutesChanged = true; } @@ -256,6 +256,7 @@ public class MediaRouter { } } } + mCurAudioRoutesInfo.bluetoothName = newRoutes.bluetoothName; } boolean isBluetoothA2dpOn() { |