Merge "Enforce BLUETOOTH_PRIVILEGED permission in AdapterService#setScanMode"...

Merge "Enforce BLUETOOTH_PRIVILEGED permission in AdapterService#setScanMode" am: 948ed629 am: f2161d69

Change-Id: I339d776b848fe748e0d3fe7bde98218c49a17564

parents 7ea023ab f2161d69

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1255,7 +1255,7 @@ public class AdapterService extends Service {
		return false;
		}

		enforceBluetoothPermission(service);
		enforceBluetoothPrivilegedPermission(service);

		service.mAdapterProperties.setDiscoverableTimeout(duration);
		return service.mAdapterProperties.setScanMode(convertScanModeToHal(mode));