From 035d65e81b198bd51f38cf9519f54331fa967a26 Mon Sep 17 00:00:00 2001 From: Hugh Chen Date: Fri, 12 Mar 2021 16:34:40 +0800 Subject: 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 --- .../settingslib/bluetooth/BluetoothEventManager.java | 1 - .../settingslib/bluetooth/BluetoothEventManagerTest.java | 15 --------------- 2 files changed, 16 deletions(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java index 8fd1910041c8..129aca4a689f 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java @@ -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: diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothEventManagerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothEventManagerTest.java index 6a4d650ebf31..4bff78f4af2c 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothEventManagerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothEventManagerTest.java @@ -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); -- cgit v1.2.3-59-g8ed1b