diff options
| author | RoboErik <epastern@google.com> | 2014-09-26 16:25:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-26 16:25:29 +0000 |
| commit | 9b2e567ad4ac3967e17d7fab5f73bf5e32433b00 (patch) | |
| tree | 0425b97b9b8bad4f6b1c7e24dec652fac4df17b2 /media | |
| parent | 40968da1b75b2805a37b461ed7458d818a9ece42 (diff) | |
| parent | 5535ea8ef876be25121a6336ffab5a0bf8dbd031 (diff) | |
| download | frameworks_base-9b2e567ad4ac3967e17d7fab5f73bf5e32433b00.zip frameworks_base-9b2e567ad4ac3967e17d7fab5f73bf5e32433b00.tar.gz frameworks_base-9b2e567ad4ac3967e17d7fab5f73bf5e32433b00.tar.bz2 | |
Merge "Remove BT routes when BT is turned off" into lmp-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/AudioService.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index 71a05ab..5c2abc5 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -4174,6 +4174,14 @@ public class AudioService extends IAudioService.Stub { AudioSystem.DEVICE_STATE_UNAVAILABLE, address); mConnectedDevices.remove(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP); + synchronized (mCurAudioRoutes) { + // Remove A2DP routes as well + if (mCurAudioRoutes.mBluetoothName != null) { + mCurAudioRoutes.mBluetoothName = null; + sendMsg(mAudioHandler, MSG_REPORT_NEW_ROUTES, + SENDMSG_NOOP, 0, 0, null, 0); + } + } } // must be called synchronized on mConnectedDevices |