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

Commit 6b8ddccb authored by Zach Johnson's avatar Zach Johnson Committed by Android (Google) Code Review
Browse files

Merge "Resolve bluetooth hidden API usages"

parents a2781721 4a5c1286

src/com/android/settings/bluetooth/BluetoothPairingController.java

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ public class BluetoothPairingController implements OnCheckedChangeListener, 
     */

    public void onCancel() {

        Log.d(TAG, "Pairing dialog canceled");

        mDevice.cancelPairing();

        mDevice.cancelBondProcess();

    }



    /**

src/com/android/settings/bluetooth/BluetoothPairingService.java

+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ public final class BluetoothPairingService extends Service { 
            } else if (action.equals(ACTION_DISMISS_PAIRING)) {

                Log.d(TAG, "Notification cancel " + " (" +

                        mDevice.getName() + ")");

                mDevice.cancelPairing();

                mDevice.cancelBondProcess();

            } else {

                int bondState = intent.getIntExtra(BluetoothDevice.EXTRA_BOND_STATE,

                        BluetoothDevice.ERROR);
@@ -144,7 +144,7 @@ public final class BluetoothPairingService extends Service { 
            createPairingNotification(intent);

        } else if (TextUtils.equals(action, ACTION_DISMISS_PAIRING)) {

            Log.d(TAG, "Notification cancel " + " (" + mDevice.getName() + ")");

            mDevice.cancelPairing();

            mDevice.cancelBondProcess();

            mNm.cancel(NOTIFICATION_ID);

            stopSelf();

        } else if (TextUtils.equals(action, ACTION_PAIRING_DIALOG)) {

tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingServiceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ public class BluetoothPairingServiceTest { 


        mBluetoothPairingService.onStartCommand(intent, /* flags */ 0, /* startId */ 0);



        verify(mDevice).cancelPairing();

        verify(mDevice).cancelBondProcess();

        verify(mNm).cancel(mBluetoothPairingService.NOTIFICATION_ID);

    }