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

Commit 52519f88 authored by Himanshu Rawat's avatar Himanshu Rawat Committed by Automerger Merge Worker
Browse files

Merge "Log instances where removebond API is ignored" into main am: bde5aaf2 

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



Change-Id: I9e83b9ce5319b6c7ba7912c9b73deacddcb5e5b2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 48fc8fd2 bde5aaf2

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

+7 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import static com.android.bluetooth.Utils.getBytesFromAddress; 
import static com.android.bluetooth.Utils.hasBluetoothPrivilegedPermission;

import static com.android.bluetooth.Utils.isDualModeAudioEnabled;

import static com.android.bluetooth.Utils.isPackageNameAccurate;



import static java.util.Objects.requireNonNull;



import android.annotation.NonNull;
@@ -2801,6 +2800,13 @@ public class AdapterService extends Service { 


            DeviceProperties deviceProp = service.mRemoteDevices.getDeviceProperties(device);

            if (deviceProp == null || deviceProp.getBondState() != BluetoothDevice.BOND_BONDED) {

                Log.w(

                        TAG,

                        device.getAddressForLogging()

                                + " cannot be removed since "

                                + ((deviceProp == null)

                                        ? "properties are empty"

                                        : "bond state is " + deviceProp.getBondState()));

                return false;

            }

            service.mBondAttemptCallerInfo.remove(device.getAddress());

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

+8 −0
Original line number Diff line number Diff line
@@ -343,6 +343,14 @@ final class BondStateMachine extends StateMachine { 
                return true;

            }

        }



        Log.w(

                TAG,

                dev.getAddressForLogging()

                        + " cannot be removed since "

                        + ((devProp == null)

                                ? "properties are empty"

                                : "bond state is " + devProp.getBondState()));

        return false;

    }