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

Commit 72a9b78f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "API Review: add `UNBOND` in `EXTRA_REASON` name" into tm-dev am: faaf1983 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17196083

Change-Id: Ie6120ff8548c1c87ee3cd39cf23d799b1a56426b
parents 02030cfa faaf1983

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

+1 −1
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ public class BluetoothEventManager { 
                        || cachedDevice.getHiSyncId() != BluetoothHearingAid.HI_SYNC_ID_INVALID) {

                    mDeviceManager.onDeviceUnpaired(cachedDevice);

                }

                int reason = intent.getIntExtra(BluetoothDevice.EXTRA_REASON,

                int reason = intent.getIntExtra(BluetoothDevice.EXTRA_UNBOND_REASON,

                        BluetoothDevice.ERROR);



                showUnbondMessage(context, cachedDevice.getName(), reason);

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

+7 −4
Original line number Diff line number Diff line
@@ -357,7 +357,8 @@ public class BluetoothEventManagerTest { 
        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_AUTH_TIMEOUT);

        mIntent.putExtra(BluetoothDevice.EXTRA_UNBOND_REASON,

                BluetoothDevice.UNBOND_REASON_AUTH_TIMEOUT);

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

        when(mCachedDevice1.getName()).thenReturn(DEVICE_NAME);
@@ -372,7 +373,7 @@ public class BluetoothEventManagerTest { 
        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,

        mIntent.putExtra(BluetoothDevice.EXTRA_UNBOND_REASON,

                BluetoothDevice.UNBOND_REASON_REMOTE_DEVICE_DOWN);

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

        when(mCachedDevice1.getName()).thenReturn(DEVICE_NAME);
@@ -388,7 +389,8 @@ public class BluetoothEventManagerTest { 
        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_AUTH_REJECTED);

        mIntent.putExtra(BluetoothDevice.EXTRA_UNBOND_REASON,

                BluetoothDevice.UNBOND_REASON_AUTH_REJECTED);

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

        when(mCachedDevice1.getName()).thenReturn(DEVICE_NAME);
@@ -403,7 +405,8 @@ public class BluetoothEventManagerTest { 
        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_AUTH_FAILED);

        mIntent.putExtra(BluetoothDevice.EXTRA_UNBOND_REASON,

                BluetoothDevice.UNBOND_REASON_AUTH_FAILED);

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

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