Merge "Fix MediaRouter prioritization around a2dp devices" into jb-mr1-dev

Author: adamp

media/java/android/media/MediaRouter.java

@@ -152,6 +152,8 @@ void updateAudioRoutes(AudioRoutesInfo newRoutes) {
                 dispatchRouteChanged(sStatic.mDefaultAudioVideo);
             }
 
+            final int mainType = mCurAudioRoutesInfo.mMainType;
+
             boolean a2dpEnabled;
             try {
                 a2dpEnabled = mAudioService.isBluetoothA2dpOn();
@@ -180,11 +182,10 @@ void updateAudioRoutes(AudioRoutesInfo newRoutes) {
             }
 
             if (mBluetoothA2dpRoute != null) {
-                if (mCurAudioRoutesInfo.mMainType != AudioRoutesInfo.MAIN_SPEAKER &&
-                        mSelectedRoute == mBluetoothA2dpRoute) {
+                if (mainType != AudioRoutesInfo.MAIN_SPEAKER &&
+                        mSelectedRoute == mBluetoothA2dpRoute && !a2dpEnabled) {
                     selectRouteStatic(ROUTE_TYPE_LIVE_AUDIO, mDefaultAudioVideo);
-                } else if (mCurAudioRoutesInfo.mMainType == AudioRoutesInfo.MAIN_SPEAKER &&
-                        (mSelectedRoute == mDefaultAudioVideo || mSelectedRoute == null) &&
+                } else if ((mSelectedRoute == mDefaultAudioVideo || mSelectedRoute == null) &&
                         a2dpEnabled) {
                     selectRouteStatic(ROUTE_TYPE_LIVE_AUDIO, mBluetoothA2dpRoute);
                 }