From 46cbba39efd145c4176f17ffdb8e70ce3b43e473 Mon Sep 17 00:00:00 2001 From: Tim Peng Date: Wed, 27 May 2020 16:46:45 +0800 Subject: [PATCH] Set failed state when failed to transfer a disconnected device -Update test case Bug: 157139936 Test: make -j50 RunSettingsLibRoboTests Change-Id: I1c908e108fa7795550e2b84758b5dd6f13d541e5 --- .../src/com/android/settingslib/media/LocalMediaManager.java | 2 +- .../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 197e34df22a83..22c0b41791dbb 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java @@ -624,7 +624,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; } dispatchDeviceAttributesChanged(); 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 517071b5511f9..58bfd880df651 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 @@ -505,7 +505,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