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

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

Change-Id: Ic09bc5870f99465fd2c710cd624b9dbbd4fb92b4

parents e0d95eb3 ced2f4c8

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));