Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Output Switcher] Device status is not updated when a disconnected BT device is connected and activated" into sc-dev am: 435dc859d5 am: 848aad376a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15100487

Change-Id: I36c6b6273b211a9a647f6f78bef902b52f9e1c01
This commit is contained in:
tim peng
2021-06-28 07:15:15 +00:00
committed by Automerger Merge Worker
parent 31c98b2411 848aad376a
commit 623aa566d0
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java
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);