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

Merge "Add missing permission enforcement." into sc-dev am: 78896f98c0

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14772958

Change-Id: Ia9abc1dd9025c2ed5abc0478b1cb528b1e9145b9
This commit is contained in:
TreeHugger Robot
2021-06-01 22:24:59 +00:00
committed by Automerger Merge Worker
parent b63615d0e0 78896f98c0
commit 5f62a99554
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/permission/PermissionControllerService.java
View File

@@ -543,6 +543,9 @@ public abstract class PermissionControllerService extends Service {
public void updateUserSensitiveForApp(int uid, @NonNull AndroidFuture callback) {
Preconditions.checkNotNull(callback, "callback cannot be null");
enforceSomePermissionsGrantedToCaller(
Manifest.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY);
try {
onUpdateUserSensitivePermissionFlags(uid, () -> callback.complete(null));
} catch (Exception e) {
@@ -609,9 +612,7 @@ public abstract class PermissionControllerService extends Service {
try {
Objects.requireNonNull(permissionGroupName);
Objects.requireNonNull(callback);
PermissionControllerService
.this
.onGetGroupOfPlatformPermission(
PermissionControllerService.this.onGetGroupOfPlatformPermission(
permissionGroupName, callback::complete);
} catch (Throwable t) {
callback.completeExceptionally(t);