Commit 685c79bc authored Apr 28, 2021 by Rahul Sabnis Committed by Automerger Merge Worker Apr 28, 2021

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 am: 437e1b17 am: 94f8a22c

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

Change-Id: I562dbd4a60e95def84b19cc23d533bc5d6ab3c93

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -3701,8 +3701,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;