summaryrefslogtreecommitdiffstats
path: root/src/com/android/bluetooth/a2dp/Avrcp.java
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2014-04-17 02:47:56 -0700
committerSteve Kondik <shade@chemlab.org>2014-04-17 03:19:00 -0700
commit3c99a1e84c0a529310c1892d928eb3824e0e47be (patch)
tree8da328a4c2fc59e88b4b4774aca8360717cfc22b /src/com/android/bluetooth/a2dp/Avrcp.java
parent35743ee540dd399a19929b75cdf8e13a0461c4ff (diff)
parent91ba9534bf14cd141071d4a88019f582115fce87 (diff)
downloadandroid_packages_apps_Bluetooth-3c99a1e84c0a529310c1892d928eb3824e0e47be.tar.gz
android_packages_apps_Bluetooth-3c99a1e84c0a529310c1892d928eb3824e0e47be.tar.bz2
android_packages_apps_Bluetooth-3c99a1e84c0a529310c1892d928eb3824e0e47be.zip
Merge branch 'LNX.LA.3.5.2_RB1' of git://codeaurora.org/platform/packages/apps/Bluetooth into cm-11.0next
Change-Id: I2452b5410e87fa2ef0d09d5929e5813622f17d5b
Diffstat (limited to 'src/com/android/bluetooth/a2dp/Avrcp.java')
-rw-r--r--src/com/android/bluetooth/a2dp/Avrcp.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/bluetooth/a2dp/Avrcp.java b/src/com/android/bluetooth/a2dp/Avrcp.java
index 6533b935b..f2d559801 100644
--- a/src/com/android/bluetooth/a2dp/Avrcp.java
+++ b/src/com/android/bluetooth/a2dp/Avrcp.java
@@ -875,12 +875,15 @@ final class Avrcp {
}
private void updateAddressedMediaPlayer(int playerId) {
if (DEBUG) Log.v(TAG, "updateAddressedMediaPlayer");
+ int previousAddressedPlayerId = mAddressedPlayerId;
if ((mAddressedPlayerChangedNT == NOTIFICATION_TYPE_INTERIM) && (mAddressedPlayerId != playerId)) {
if (DEBUG) Log.v(TAG, "send AddressedMediaPlayer to stack: playerId" + playerId);
mAddressedPlayerId = playerId;
mAddressedPlayerChangedNT = NOTIFICATION_TYPE_CHANGED;
registerNotificationRspAddressedPlayerChangedNative(mAddressedPlayerChangedNT, mAddressedPlayerId);
- resetAndSendPlayerStatusReject();
+ if (previousAddressedPlayerId != 0) {
+ resetAndSendPlayerStatusReject();
+ }
} else {
mAddressedPlayerId = playerId;
}