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

Commit 035d65e8 authored by Hugh Chen's avatar Hugh Chen
Browse files

Do not show error toast when received UNBOND_REASON_REMOVED 

Do not show error toast when received UNBOND_REASON_REMOVED,
because this reason is also received when devices unbond
like forget devices.

Bug: 181738217
Bug: 173165769
Test: make -j42 RunSettingsLibRoboTests
Change-Id: I7c9675014bb642a28dcfb313fa5ce7283cb43d92
parent b797729b

packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java

+0 −1
Original line number Diff line number Diff line
@@ -386,7 +386,6 @@ public class BluetoothEventManager { 
                case BluetoothDevice.UNBOND_REASON_AUTH_TIMEOUT:

                case BluetoothDevice.UNBOND_REASON_REPEATED_ATTEMPTS:

                case BluetoothDevice.UNBOND_REASON_REMOTE_AUTH_CANCELED:

                case BluetoothDevice.UNBOND_REASON_REMOVED:

                    errorMsg = R.string.bluetooth_pairing_error_message;

                    break;

                default:

packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothEventManagerTest.java

+0 −15
Original line number Diff line number Diff line
@@ -352,21 +352,6 @@ public class BluetoothEventManagerTest { 
        assertThat(mCachedDevice2.isActiveDevice(BluetoothProfile.HEARING_AID)).isFalse();

    }



    @Test

    public void showUnbondMessage_reasonRemoved_showCorrectedErrorCode() {

        mIntent = new Intent(BluetoothDevice.ACTION_BOND_STATE_CHANGED);

        mIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mBluetoothDevice);

        mIntent.putExtra(BluetoothDevice.EXTRA_BOND_STATE, BluetoothDevice.BOND_NONE);

        mIntent.putExtra(BluetoothDevice.EXTRA_REASON, BluetoothDevice.UNBOND_REASON_REMOVED);

        when(mCachedDeviceManager.findDevice(mBluetoothDevice)).thenReturn(mCachedDevice1);

        when(mCachedDevice1.getName()).thenReturn(DEVICE_NAME);



        mContext.sendBroadcast(mIntent);



        verify(mErrorListener).onShowError(any(Context.class), eq(DEVICE_NAME),

                eq(R.string.bluetooth_pairing_error_message));

    }



    @Test

    public void showUnbondMessage_reasonAuthTimeout_showCorrectedErrorCode() {

        mIntent = new Intent(BluetoothDevice.ACTION_BOND_STATE_CHANGED);