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

Commit f2ba9df1 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: 35728321 am: b09e2b8d

Change-Id: Iecc0502cd74c30cafc6bc1a79098b30f2ee36d60
parents 3c4f7d95 b09e2b8d

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