Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev

Browse Source
This commit is contained in:
Ivan Podogov
2017-01-03 11:00:49 +00:00
committed by Android (Google) Code Review
parent 821fdbd3ff d2d32b1f32
commit 34624a5d83
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
services/core/java/com/android/server/BluetoothManagerService.java
View File

@@ -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() {