Merge "[Output Switcher] Device status is not updated when a disconnected BT device is connected and activated" into sc-dev

This commit is contained in:
tim peng
2021-06-28 06:51:47 +00:00
committed by Android (Google) Code Review

View File

@@ -142,6 +142,9 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter {
mDivider.setVisibility(View.GONE);
mAddIcon.setVisibility(View.GONE);
}
if (mCurrentActivePosition == position) {
mCurrentActivePosition = -1;
}
if (mController.isTransferring()) {
if (device.getState() == MediaDeviceState.STATE_CONNECTING
&& !mController.hasAdjustVolumeUserRestriction()) {
@@ -214,6 +217,7 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter {
return;
}
mCurrentActivePosition = -1;
playSwitchingAnim(mConnectedItem, view);
mController.connectDevice(device);
device.setState(MediaDeviceState.STATE_CONNECTING);