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

Merge changes from topic "presubmit-am-eb743dcef6874f73b81d4e42bb9d33ba" into sc-v2-dev-plus-aosp am: 70566e58c7

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

Change-Id: I422515b49628f8ec5682e956551dfc22feb467b9
This commit is contained in:
TreeHugger Robot
2022-02-08 10:34:23 +00:00
committed by Automerger Merge Worker
parent 154a3c556f 70566e58c7
commit f73dd5a39a
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java
View File

@@ -172,8 +172,8 @@ public class LocalMediaManager implements BluetoothCallback {
}
}
if (device == mCurrentConnectedDevice) {
Log.d(TAG, "connectDevice() this device all ready connected! : " + device.getName());
if (device.equals(mCurrentConnectedDevice)) {
Log.d(TAG, "connectDevice() this device is already connected! : " + device.getName());
return false;
}

5
packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java
View File

@@ -213,7 +213,10 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter {
if (mController.isTransferring()) {
return;
}
if (isCurrentlyConnected(device)) {
Log.d(TAG, "This device is already connected! : " + device.getName());
return;
}
mCurrentActivePosition = -1;
mController.connectDevice(device);
device.setState(MediaDeviceState.STATE_CONNECTING);