| commit | d13c118417777bce77b278789fa0c3dd184c35ef | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Sep 04 18:03:57 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 04 18:03:57 2024 +0000 |
| tree | 1205da34c2448dfc1ef25a6630f5e436cb8ce4e9 | |
| parent | 790e281f31608990232483a303142abe04f0d36d [diff] | |
| parent | 381fc97a414ce91a92beccc082ebec07a7ef1b86 [diff] |
Merge "Amend typo for DefaultPermissionGrantPolicy" into main am: 381fc97a41 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3250952 Change-Id: Ic6c95c6234ac322546f896155a5e0e998bdae73c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java index 5eda6de..ada812e 100644 --- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java +++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
@@ -1360,7 +1360,7 @@ for (int requestedPermissionNum = 0; requestedPermissionNum < numRequestedPermissions; requestedPermissionNum++) { - String permission = requestedPermissions[requestedPermissionNum]; + String permission = sortedRequestedPermissions[requestedPermissionNum]; // If there is a disabled system app it may request a permission the updated // version ot the data partition doesn't, In this case skip the permission.