diff options
| author | Adam Powell <adamp@google.com> | 2012-07-16 17:30:42 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-07-16 17:30:42 -0700 |
| commit | 388953942b536b5eebd942ef78ae5b7499bc2078 (patch) | |
| tree | 46aba850fb22cc7a84d9f256e5668f46f32710a2 | |
| parent | 1878bef2c455e11b6166326130d422a1c10ee1b1 (diff) | |
| parent | bcf21e913af7252fb1994e07b6cf179321ecd049 (diff) | |
| download | frameworks_base-388953942b536b5eebd942ef78ae5b7499bc2078.zip frameworks_base-388953942b536b5eebd942ef78ae5b7499bc2078.tar.gz frameworks_base-388953942b536b5eebd942ef78ae5b7499bc2078.tar.bz2 | |
Merge "Properly switch MediaRouter to wired audio over a2dp." into jb-dev
| -rw-r--r-- | media/java/android/media/MediaRouter.java | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/media/java/android/media/MediaRouter.java b/media/java/android/media/MediaRouter.java index 357bf4e..a256079 100644 --- a/media/java/android/media/MediaRouter.java +++ b/media/java/android/media/MediaRouter.java @@ -126,6 +126,15 @@ public class MediaRouter { sStatic.mDefaultAudio.mNameResId = name; dispatchRouteChanged(sStatic.mDefaultAudio); } + + boolean a2dpEnabled; + try { + a2dpEnabled = mAudioService.isBluetoothA2dpOn(); + } catch (RemoteException e) { + Log.e(TAG, "Error querying Bluetooth A2DP state", e); + a2dpEnabled = false; + } + if (!TextUtils.equals(newRoutes.mBluetoothName, mCurRoutesInfo.mBluetoothName)) { mCurRoutesInfo.mBluetoothName = newRoutes.mBluetoothName; if (mCurRoutesInfo.mBluetoothName != null) { @@ -135,13 +144,6 @@ public class MediaRouter { info.mSupportedTypes = ROUTE_TYPE_LIVE_AUDIO; sStatic.mBluetoothA2dpRoute = info; addRoute(sStatic.mBluetoothA2dpRoute); - try { - if (mAudioService.isBluetoothA2dpOn()) { - selectRouteStatic(ROUTE_TYPE_LIVE_AUDIO, mBluetoothA2dpRoute); - } - } catch (RemoteException e) { - Log.e(TAG, "Error selecting Bluetooth A2DP route", e); - } } else { sStatic.mBluetoothA2dpRoute.mName = mCurRoutesInfo.mBluetoothName; dispatchRouteChanged(sStatic.mBluetoothA2dpRoute); @@ -151,6 +153,16 @@ public class MediaRouter { sStatic.mBluetoothA2dpRoute = null; } } + + if (mBluetoothA2dpRoute != null) { + if (mCurRoutesInfo.mMainType != AudioRoutesInfo.MAIN_SPEAKER && + mSelectedRoute == mBluetoothA2dpRoute) { + selectRouteStatic(ROUTE_TYPE_LIVE_AUDIO, mDefaultAudio); + } else if (mCurRoutesInfo.mMainType == AudioRoutesInfo.MAIN_SPEAKER && + mSelectedRoute == mDefaultAudio && a2dpEnabled) { + selectRouteStatic(ROUTE_TYPE_LIVE_AUDIO, mBluetoothA2dpRoute); + } + } } } |