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

Commit 437e1b17 authored by Rahul Sabnis's avatar Rahul Sabnis Committed by Automerger Merge Worker
Browse files

Merge "Fix issue where the caller's identity was being used for the LE batch... 

Merge "Fix issue where the caller's identity was being used for the LE batch scan report delay floor" am: a0e60fd9

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

Change-Id: I7cbfb66c4583039a3c40d9194180da2a07baa06c
parents 7994d29a a0e60fd9

src/com/android/bluetooth/gatt/GattService.java

+3 −0
Original line number Diff line number Diff line
@@ -3297,8 +3297,11 @@ public class GattService extends ProfileService { 
            return settings;

        }



        // Need to clear identity to pass device config permission check

        long callerToken = Binder.clearCallingIdentity();

        long floor = DeviceConfig.getLong(DeviceConfig.NAMESPACE_BLUETOOTH, "report_delay",

                DEFAULT_REPORT_DELAY_FLOOR);

        Binder.restoreCallingIdentity(callerToken);



        if (settings.getReportDelayMillis() > floor) {

            return settings;