commit 78896f98c061ee7dbc59e2464d9f5e7c12eb14ad
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jun 01 21:50:44 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 01 21:50:44 2021 +0000
tree 8ab0cec2c66aa98756a133992b84f1faee23fc03
parent b84e5cda8828449688ed05fce8a49adbd8a9a19d
parent a4015ce67a2b7f1b78aa33f536319eb5f1f26468

Merge "Add missing permission enforcement." into sc-dev

core/java/android/permission/PermissionControllerService.java

diff --git a/core/java/android/permission/PermissionControllerService.java b/core/java/android/permission/PermissionControllerService.java
index 9839046..8854e27 100644
--- a/core/java/android/permission/PermissionControllerService.java
+++ b/core/java/android/permission/PermissionControllerService.java
@@ -543,6 +543,9 @@
             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 @@
                 try {
                     Objects.requireNonNull(permissionGroupName);
                     Objects.requireNonNull(callback);
-                    PermissionControllerService
-                            .this
-                            .onGetGroupOfPlatformPermission(
+                    PermissionControllerService.this.onGetGroupOfPlatformPermission(
                             permissionGroupName, callback::complete);
                 } catch (Throwable t) {
                     callback.completeExceptionally(t);