summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-11-25 16:28:56 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2014-11-25 16:28:56 -0800
commitc7c9a230ac47120fc82739bac450e997cbb923f6 (patch)
tree717009c03be58672c8c55f0194cf12aa459029f1
parent025d800df0efcd0881c43cde7a8cb7267e774f25 (diff)
parent7e328b4d465fd2b5149339c1409593ef24cea095 (diff)
downloadandroid_packages_apps_Bluetooth-c7c9a230ac47120fc82739bac450e997cbb923f6.tar.gz
android_packages_apps_Bluetooth-c7c9a230ac47120fc82739bac450e997cbb923f6.tar.bz2
android_packages_apps_Bluetooth-c7c9a230ac47120fc82739bac450e997cbb923f6.zip
Merge "Bluetooth: Dont loose focus for remote suspend only in case of call"
-rw-r--r--src/com/android/bluetooth/a2dp/A2dpSinkStateMachine.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/bluetooth/a2dp/A2dpSinkStateMachine.java b/src/com/android/bluetooth/a2dp/A2dpSinkStateMachine.java
index 2f1f3d9cc..13c4ade46 100644
--- a/src/com/android/bluetooth/a2dp/A2dpSinkStateMachine.java
+++ b/src/com/android/bluetooth/a2dp/A2dpSinkStateMachine.java
@@ -619,7 +619,7 @@ final class A2dpSinkStateMachine extends StateMachine {
mPlayingDevice = null;
broadcastAudioState(device, BluetoothA2dpSink.STATE_NOT_PLAYING,
BluetoothA2dpSink.STATE_PLAYING);
- if ((mAudioFocusAcquired == AUDIO_FOCUS_LOSS_TRANSIENT) ||
+ if ((mAudioFocusAcquired == AUDIO_FOCUS_LOSS_TRANSIENT) &&
(state == AUDIO_STATE_REMOTE_SUSPEND)) {
log(" Dont't Loose audiofocus in case of suspend ");
break;