AVRCP: Serialize AVRCP Disconnect/Reconnection events
Serialize AVRCP cleanup in RC disconnection and AVRCP
connection event. So that for quick remote connection
and disconnection of remote. We handle the connection
based events in sequential manner.
CRs-Fixed: 2571392
Change-Id: I229e3689507762f915550ddb3b22c9629c65c3f9
diff --git a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
index 94c7f45..ed3da6f 100644
--- a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
+++ b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
@@ -258,8 +258,6 @@
private final static int MESSAGE_START_SHO = 34;
private static final int MSG_SET_ACTIVE_DEVICE = 35;
- private static final int STACK_CLEANUP = 0;
- private static final int APP_CLEANUP = 1;
private static final int CMD_TIMEOUT_DELAY = 2000;
private static final int MAX_ERROR_RETRY_TIMES = 6;
private static final int AVRCP_MAX_VOL = 127;
@@ -659,7 +657,7 @@
mAudioManager.unregisterAudioPlaybackCallback(mAudioManagerPlaybackCb);
if (mMediaController != null) mMediaController.unregisterCallback(mMediaControllerCb);
- Message msg = mHandler.obtainMessage(MESSAGE_DEVICE_RC_CLEANUP, APP_CLEANUP,
+ Message msg = mHandler.obtainMessage(MESSAGE_DEVICE_RC_CLEANUP, 0,
0, null);
mHandler.sendMessage(msg);
if (mMediaSessionManager != null) {
@@ -1491,27 +1489,11 @@
case MESSAGE_DEVICE_RC_CLEANUP:
if (DEBUG)
- Log.v(TAG,"MESSAGE_DEVICE_RC_CLEANUP: " + msg.arg1);
- if (msg.arg1 == STACK_CLEANUP) {
- deviceIndex = getIndexForDevice((BluetoothDevice) msg.obj);
- if (deviceIndex == INVALID_DEVICE_INDEX) {
- Log.e(TAG,"invalid device index for cleanup");
- break;
+ Log.v(TAG, "MESSAGE_DEVICE_RC_CLEANUP");
+ clearDeviceDependentFeature();
+ for (int i = 0; i < maxAvrcpConnections; i++) {
+ cleanupDeviceFeaturesIndex(i);
}
- cleanupDeviceFeaturesIndex(deviceIndex);
- } else if (msg.arg1 == APP_CLEANUP) {
- if (msg.obj == null) {
- clearDeviceDependentFeature();
- for (int i = 0; i < maxAvrcpConnections; i++) {
- cleanupDeviceFeaturesIndex(i);
- }
- } else {
- Log.v(TAG, "Invalid message params");
- break;
- }
- } else {
- Log.v(TAG, "Invalid Arguments to MESSAGE_DEVICE_RC_CLEANUP");
- }
break;
case MSG_NATIVE_REQ_GET_FOLDER_ITEMS: {
@@ -3552,22 +3534,16 @@
*/
public void setAvrcpDisconnectedDevice(BluetoothDevice device) {
Log.i(TAG,"Enter setAvrcpDisconnectedDevice");
+ int deviceIndex = INVALID_DEVICE_INDEX;
for (int i = 0; i < maxAvrcpConnections; i++ ) {
- if (deviceFeatures[i].mCurrentDevice !=null && device != null &&
+ if (deviceFeatures[i].mCurrentDevice != null && device != null &&
Objects.equals(deviceFeatures[i].mCurrentDevice, device)) {
+ deviceIndex = i;
if (deviceFeatures[i].isActiveDevice &&
deviceFeatures[i].isAbsoluteVolumeSupportingDevice) {
storeVolumeForDevice(device);
disconnectedActiveDevice = device;
- }
- // initiate cleanup for all variables;
- Message msg = mHandler.obtainMessage(MESSAGE_DEVICE_RC_CLEANUP, STACK_CLEANUP,
- 0, device);
- mHandler.sendMessage(msg);
- Log.i(TAG,"Device removed is " + device);
- Log.i(TAG,"removed at " + i);
- deviceFeatures[i].mRemoteVolume = -1;
- deviceFeatures[i].mLocalVolume = -1;
+ }
}
if (deviceFeatures[i].mCurrentDevice != null && device != null &&
!(Objects.equals(deviceFeatures[i].mCurrentDevice, device))) {
@@ -3582,6 +3558,13 @@
}
}
+ if (deviceIndex != INVALID_DEVICE_INDEX) {
+ // initiate cleanup for all variables;
+ cleanupDeviceFeaturesIndex(deviceIndex);
+ Log.i(TAG,"Device removed is " + device);
+ Log.i(TAG,"removed at " + deviceIndex);
+ }
+
BATService mBatService = BATService.getBATService();
if ((mBatService != null) && mBatService.isBATActive()) {
Log.d(TAG," setAvrcpDisconnectedDevice BA Active, update absvol support as true ");
@@ -4724,6 +4707,8 @@
deviceFeatures[index].mLastRemoteVolume = -1;
deviceFeatures[index].mLastLocalVolume = -1;
deviceFeatures[index].cache_play_cmd = false;
+ deviceFeatures[index].mRemoteVolume = -1;
+ deviceFeatures[index].mLocalVolume = -1;
}
private void onConnectionStateChanged(