Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Select a system audio route only when needed" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-09-20 02:54:45 +00:00
committed by Android (Google) Code Review
parent 14676c5da4 f8e38e2dbb
commit d4aee713d4
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/java/android/media/MediaRouter.java
View File

@@ -202,7 +202,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) {
@@ -229,8 +228,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);
}
} }
} }