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

Commit 981c8e7d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Clear calling identity when calling getConnectionState internally" into main am: a8850892 

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



Change-Id: I47c3e5e9c344b1d63195c6e7a5d20e6081a40c7d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2c268470 a8850892

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

+10 −1
Original line number Diff line number Diff line
@@ -3046,7 +3046,16 @@ public class AdapterService extends Service { 
                return BluetoothDevice.CONNECTION_STATE_DISCONNECTED;

            }



            if (Flags.apiGetConnectionStateUsingIdentityAddress()) {

                final long token = Binder.clearCallingIdentity();

                try {

                    return service.getConnectionState(device);

                } finally {

                    Binder.restoreCallingIdentity(token);

                }

            } else {

                return service.getConnectionState(device);

            }

        }



        @Override