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

Commit c65ac73d authored by Christine Hallstrom's avatar Christine Hallstrom
Browse files

Clear calling identity when calling getConnectionState internally 

Since getConnectionState can happen on binder thread, clear identity
when calling method internally so internal methods can bypass
permissions (relevant permission checks are done in method already for
app clients).

Bug: 319471537
Bug: 295010253
Test: m .
Change-Id: I93757624ebb903799831c700e4819033899162dd
parent 55df697a

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