diff options
| author | 2020-05-29 05:09:04 +0000 | |
|---|---|---|
| committer | 2020-05-29 05:09:04 +0000 | |
| commit | a3e8d09c5f656dca352117b60b409bca5fcdf329 (patch) | |
| tree | 86101bd082e6092b87e661c3e322625447518123 | |
| parent | 5958828b98656058627018771b045e1d025a422b (diff) | |
| parent | 46cbba39efd145c4176f17ffdb8e70ce3b43e473 (diff) | |
Merge "Set failed state when failed to transfer a disconnected device" into rvc-dev
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java | 2 | ||||
| -rw-r--r-- | packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/LocalMediaManagerTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java b/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java index e89f628a2757..f381cde31f83 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java @@ -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); } diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/LocalMediaManagerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/LocalMediaManagerTest.java index 009f75a393e2..368245f2002d 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/LocalMediaManagerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/LocalMediaManagerTest.java @@ -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 |