In permission review mode, always request user's consent to toggle BT. (fbccc787) · Commits · e / os / android_packages_modules_Bluetooth

service/java/com/android/server/bluetooth/BluetoothManagerService.java

+9 −15

Original line number	Original line	Diff line number	Diff line
	@@ -676,9 +676,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
	mContext.enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM,		mContext.enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM,
	"Need BLUETOOTH ADMIN permission");		"Need BLUETOOTH ADMIN permission");

	if (!isEnabled() && mPermissionReviewRequired		if (!isEnabled() && mPermissionReviewRequired) {
	&& startConsentUiIfNeeded(packageName, callingUid,		startConsentUi(packageName, callingUid, BluetoothAdapter.ACTION_REQUEST_ENABLE);
	BluetoothAdapter.ACTION_REQUEST_ENABLE)) {
	return false;		return false;
	}		}
	}		}
	@@ -711,9 +710,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
	mContext.enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM,		mContext.enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM,
	"Need BLUETOOTH ADMIN permission");		"Need BLUETOOTH ADMIN permission");

	if (isEnabled() && mPermissionReviewRequired		if (isEnabled() && mPermissionReviewRequired) {
	&& startConsentUiIfNeeded(packageName, callingUid,		startConsentUi(packageName, callingUid, BluetoothAdapter.ACTION_REQUEST_DISABLE);
	BluetoothAdapter.ACTION_REQUEST_DISABLE)) {
	return false;		return false;
	}		}
	}		}
	@@ -736,8 +734,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
	return true;		return true;
	}		}

	private boolean startConsentUiIfNeeded(String packageName,		private void startConsentUi(String packageName, int callingUid, String intentAction)
	int callingUid, String intentAction) throws RemoteException {		throws RemoteException {
	try {		try {
	// Validate the package only if we are going to use it		// Validate the package only if we are going to use it
	ApplicationInfo applicationInfo = mContext.getPackageManager()		ApplicationInfo applicationInfo = mContext.getPackageManager()
	@@ -749,16 +747,12 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
	+ " not in uid " + callingUid);		+ " not in uid " + callingUid);
	}		}

	// Legacy apps in permission review mode trigger a user prompt		// Permission review mode, trigger a user prompt
	if (applicationInfo.targetSdkVersion < Build.VERSION_CODES.M) {
	Intent intent = new Intent(intentAction);		Intent intent = new Intent(intentAction);
	mContext.startActivity(intent);		mContext.startActivity(intent);
	return true;
	}
	} catch (PackageManager.NameNotFoundException e) {		} catch (PackageManager.NameNotFoundException e) {
	throw new RemoteException(e.getMessage());		throw new RemoteException(e.getMessage());
	}		}
	return false;
	}		}

	public void unbindAndFinish() {		public void unbindAndFinish() {