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

Commit 5d232f68 authored by Kyunglyul Hyun's avatar Kyunglyul Hyun Committed by Automerger Merge Worker
Browse files

Merge "Correct return of BluteoothDevice#createBond" am: 732a57d9 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2584039



Change-Id: Id86aff4fcdeecf5ea67dc62a7c9ada7b8b78e926
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f89d1c6f 732a57d9

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+2 −1
Original line number Diff line number Diff line
@@ -5226,7 +5226,8 @@ public class AdapterService extends Service { 
            OobData remoteP256Data, String callingPackage) {

        DeviceProperties deviceProp = mRemoteDevices.getDeviceProperties(device);

        if (deviceProp != null && deviceProp.getBondState() != BluetoothDevice.BOND_NONE) {

            return false;

            // true for BONDING, false for BONDED

            return deviceProp.getBondState() == BluetoothDevice.BOND_BONDING;

        }



        if (!isPackageNameAccurate(this, callingPackage, Binder.getCallingUid())) {