Merge 22da7b757b989ff6df0bc732265bd5a5847a61ac on remote branch
Change-Id: Ie6e4c41a2b28fbea4cf6b19ad08425e52798f25f
diff --git a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
index ec97714..710afbb 100644
--- a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
+++ b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
@@ -147,7 +147,6 @@
private boolean mFastforward;
private boolean mRewind;
- private boolean mRemotePassthroughCmd;
private String mAddress;
@@ -487,7 +486,6 @@
}
mFastforward = false;
mRewind = false;
- mRemotePassthroughCmd = false;
mCurrentBrowsingDevice = null;
mBrowsingActiveDevice = null;
@@ -1713,6 +1711,9 @@
}
deviceFeatures[deviceIndex].isActiveDevice = true;
+ if (mFastforward) mFastforward = false;
+ if (mRewind) mRewind = false;
+
Log.w(TAG, "Active device Calling SetBrowsePackage for " + mCachedBrowsePlayer);
if (mCachedBrowsePlayer != null && is_player_updated_for_browse == false) {
SetBrowsePackage(mCachedBrowsePlayer);
@@ -2061,7 +2062,8 @@
for (int i = 0; i < maxAvrcpConnections; i++) {
if (i != deviceIndex && !deviceFeatures[i].isActiveDevice &&
deviceFeatures[i].mLastRspPlayStatus == PLAYSTATUS_PLAYING &&
- (state != null && state.getState() == PlaybackState.STATE_PLAYING)) {
+ (state != null && state.getState() == PlaybackState.STATE_PLAYING) &&
+ (!isTwsPlusPair(deviceFeatures[i].mCurrentDevice, deviceFeatures[deviceIndex].mCurrentDevice))) {
PlaybackState.Builder playState = new PlaybackState.Builder();
playState.setState(PlaybackState.STATE_PAUSED,
PlaybackState.PLAYBACK_POSITION_UNKNOWN, 1.0f);
@@ -2913,7 +2915,8 @@
mHandler.removeMessages(currMsgPlayIntervalTimeout);
if ((deviceFeatures[i].mCurrentDevice != null) &&
(deviceFeatures[i].mPlayPosChangedNT == AvrcpConstants_ext.NOTIFICATION_TYPE_INTERIM) &&
- (isPlayingState(deviceFeatures[i].mCurrentPlayState)) && !isPlayerPaused()) {
+ (isPlayingState(deviceFeatures[i].mCurrentPlayState)) &&
+ !isPlayerPaused() && deviceFeatures[i].isActiveDevice) {
Message msg = mHandler.obtainMessage(currMsgPlayIntervalTimeout, 0, 0,
deviceFeatures[i].mCurrentDevice);
long delay = deviceFeatures[i].mPlaybackIntervalMs;
@@ -3540,8 +3543,9 @@
//When A2dp playing on DUT and Remote got connected, send proper playstatus
if (isPlayingState(mCurrentPlayerState) &&
mA2dpService.isA2dpPlaying(device)) {
+ deviceFeatures[index].mLastStateUpdate = mLastStateUpdate;
deviceFeatures[index].mCurrentPlayState = mCurrentPlayerState;
- Log.i(TAG,"Send correct playstatus to remote when it gets connected: " +
+ Log.i(TAG,"Send correct playstatus and song position to remote when it gets connected: " +
deviceFeatures[index].mCurrentPlayState);
}
}
diff --git a/system_bt_ext/bta/swb/bta_ag_swb.cc b/system_bt_ext/bta/swb/bta_ag_swb.cc
index 1514bc8..ba45fcb 100644
--- a/system_bt_ext/bta/swb/bta_ag_swb.cc
+++ b/system_bt_ext/bta/swb/bta_ag_swb.cc
@@ -143,7 +143,7 @@
/* send +QAC */
APPL_TRACE_DEBUG("send +QAC codec response");
- if (property_get("persist.vendor.qcom.bluetooth.enable.swb", value, "false")
+ if (property_get("persist.vendor.qcom.bluetooth.enable.swb", value, "true")
&& strncmp(value, "true", sizeof("true")) != 0) {
bta_ag_send_result(p_scb, BTA_AG_LOCAL_RES_QAC, SWB_CODECS_UNSUPPORTD, 0);
return;