Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eab5e604 authored by tim peng's avatar tim peng Committed by Automerger Merge Worker
Browse files

Merge "Set failed state when failed to transfer a disconnected device" into... 

Merge "Set failed state when failed to transfer a disconnected device" into rvc-dev am: a3e8d09c am: 6fd32de2 am: 47de6be6

Change-Id: I5c6825288ddce8c13afbb96f39144937caf5daf8
parents 3c4f7d95 47de6be6

packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

            }

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

+1 −1
Original line number Diff line number Diff line
@@ -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