Merge "Add removeActiveDevice and enforce BLUETOOTH_PRIVILEGED in... (314c26d2) · Commits · e / os / android_packages_modules_Bluetooth

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

+16 −1

Original line number	Diff line number	Diff line
		@@ -1483,6 +1483,20 @@ public class AdapterService extends Service {
		return service.getConnectionState(device);
		}

		@Override
		public boolean removeActiveDevice(@ActiveDeviceUse int profiles) {
		if (!Utils.checkCaller()) {
		Log.w(TAG, "removeActiveDevice() - Not allowed for non-active user");
		return false;
		}

		AdapterService service = getService();
		if (service == null) {
		return false;
		}
		return service.setActiveDevice(null, profiles);
		}

		@Override
		public boolean setActiveDevice(BluetoothDevice device, @ActiveDeviceUse int profiles) {
		if (!Utils.checkCaller()) {
		@@ -2307,7 +2321,8 @@ public class AdapterService extends Service {
		* @return false if profiles value is not one of the constants we accept, true otherwise
		*/
		public boolean setActiveDevice(BluetoothDevice device, @ActiveDeviceUse int profiles) {
		enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH ADMIN permission");
		enforceCallingOrSelfPermission(
		BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");

		boolean setA2dp = false;
		boolean setHeadset = false;