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

Merge "Set failed state when failed to transfer a disconnected device" into rvc-dev

Browse Source
This commit is contained in:
tim peng
2020-05-29 05:09:04 +00:00
committed by Android (Google) Code Review
parent 5958828b98 46cbba39ef
commit a3e8d09c5f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -639,7 +639,7 @@ public class LocalMediaManager implements BluetoothCallback {
.isBusy()
&& !mOnTransferBluetoothDevice.isConnected()) {
// Failed to connect
mOnTransferBluetoothDevice.setState(MediaDeviceState.STATE_DISCONNECTED);
mOnTransferBluetoothDevice.setState(MediaDeviceState.STATE_CONNECTING_FAILED);
mOnTransferBluetoothDevice = null;
dispatchOnRequestFailed(REASON_UNKNOWN_ERROR);
}

2
packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/LocalMediaManagerTest.java
View File

@@ -506,7 +506,7 @@ public class LocalMediaManagerTest {
mLocalMediaManager.connectDevice(device);
mLocalMediaManager.mDeviceAttributeChangeCallback.onDeviceAttributesChanged();
verify(device).setState(LocalMediaManager.MediaDeviceState.STATE_DISCONNECTED);
verify(device).setState(LocalMediaManager.MediaDeviceState.STATE_CONNECTING_FAILED);
}
@Test