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

Commit 1182bb9f authored by Kyunglyul Hyun's avatar Kyunglyul Hyun Committed by Automerger Merge Worker
Browse files

Merge "Use identity address in PanService" into main am: d2ef0653 

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



Change-Id: Idf6d643e88123e55158079b20f0bb60f4943b9a5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7e443e2a d2ef0653

android/app/src/com/android/bluetooth/pan/PanService.java

+9 −2
Original line number Original line Diff line number Diff line
@@ -98,7 +98,11 @@ public class PanService extends ProfileService { 
                        Log.e(TAG, "Error setting up tether interface: " + error);

                        Log.e(TAG, "Error setting up tether interface: " + error);

                        for (Map.Entry device : mPanDevices.entrySet()) {

                        for (Map.Entry device : mPanDevices.entrySet()) {

                            mNativeInterface.disconnect(

                            mNativeInterface.disconnect(

                                    Utils.getByteAddress((BluetoothDevice) device.getKey()));

                                    Flags.panUseIdentityAddress()

                                            ? Utils.getByteBrEdrAddress(

                                                    (BluetoothDevice) device.getKey())

                                            : Utils.getByteAddress(

                                                    (BluetoothDevice) device.getKey()));

                        }

                        }

                        mPanDevices.clear();

                        mPanDevices.clear();

                        mIsTethering = false;

                        mIsTethering = false;
@@ -662,7 +666,10 @@ public class PanService extends ProfileService { 
                            "handlePanDeviceStateChange BT tethering is off/Local role"

                            "handlePanDeviceStateChange BT tethering is off/Local role"

                                    + " is PANU drop the connection");

                                    + " is PANU drop the connection");

                    mPanDevices.remove(device);

                    mPanDevices.remove(device);

                    mNativeInterface.disconnect(Utils.getByteAddress(device));

                    mNativeInterface.disconnect(

                            Flags.panUseIdentityAddress()

                                    ? Utils.getByteBrEdrAddress(device)

                                    : Utils.getByteAddress(device));

                    return;

                    return;

                }

                }

                Log.d(TAG, "handlePanDeviceStateChange LOCAL_NAP_ROLE:REMOTE_PANU_ROLE");

                Log.d(TAG, "handlePanDeviceStateChange LOCAL_NAP_ROLE:REMOTE_PANU_ROLE");