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

Browse Source 
* changes:
  [automerge] Avoid connecting the device again when the device is already connected 2p: 38c191d6c6
  Avoid connecting the device again when the device is already connected
This commit is contained in:
TreeHugger Robot
2022-02-08 09:57:45 +00:00
committed by Android (Google) Code Review
parent ed3eb039b8 0bebd40132
commit 70566e58c7
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) { if (device.equals(mCurrentConnectedDevice)) {
Log.d(TAG, "connectDevice() this device all ready connected! : " + device.getName()); Log.d(TAG, "connectDevice() this device is already connected! : " + device.getName());
return false; return false;
} }

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

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