diff options
| author | Chong Zhang <chz@google.com> | 2013-07-26 23:46:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-26 23:46:46 +0000 |
| commit | d7c05c2ca9f641ad69bd7282ffc4fa1e835d3092 (patch) | |
| tree | 613c1a35ff9c6057dd8f2a9ad912dfb899a25b00 /media/java | |
| parent | ddb1428ab619b624fffb6f425deef57d149c95a1 (diff) | |
| parent | 2e5fbf552113024bbd143cec87000f28013af17d (diff) | |
| download | frameworks_base-d7c05c2ca9f641ad69bd7282ffc4fa1e835d3092.zip frameworks_base-d7c05c2ca9f641ad69bd7282ffc4fa1e835d3092.tar.gz frameworks_base-d7c05c2ca9f641ad69bd7282ffc4fa1e835d3092.tar.bz2 | |
Merge "Select BT route when currently selected route becomes unavailable"
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/MediaRouter.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/media/java/android/media/MediaRouter.java b/media/java/android/media/MediaRouter.java index 420a195..9a79c94 100644 --- a/media/java/android/media/MediaRouter.java +++ b/media/java/android/media/MediaRouter.java @@ -654,7 +654,13 @@ public class MediaRouter { if (info == sStatic.mSelectedRoute) { // Removing the currently selected route? Select the default before we remove it. // TODO: Be smarter about the route types here; this selects for all valid. - selectRouteStatic(ROUTE_TYPE_LIVE_AUDIO | ROUTE_TYPE_USER, sStatic.mDefaultAudioVideo); + if (info != sStatic.mBluetoothA2dpRoute && sStatic.mBluetoothA2dpRoute != null) { + selectRouteStatic(ROUTE_TYPE_LIVE_AUDIO | ROUTE_TYPE_USER, + sStatic.mBluetoothA2dpRoute); + } else { + selectRouteStatic(ROUTE_TYPE_LIVE_AUDIO | ROUTE_TYPE_USER, + sStatic.mDefaultAudioVideo); + } } if (!found) { sStatic.mCategories.remove(removingCat); |