| commit | 6c22d6c1e69676c5c68d21928aa5486bfd1bd131 | [log] [tgz] |
|---|---|---|
| author | Yi-an Chen <theianchen@google.com> | Wed Feb 21 01:56:22 2024 +0000 |
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Wed Apr 10 21:56:55 2024 +0000 |
| tree | 27151b410085621fa518cbb45545d5a7b3b64074 | |
| parent | 0a645bd7c46ffdff58a71e18b775e9816d69e1d2 [diff] |
Fix error handling for non-dynamic permissions We only allow removing dynamic permissions. When removePermission() is called for a non-dynamic permission, in addition to logging it, we should also return early to avoid the removePermission() call. Test: manual Bug: 321555066 Fixes: 321711213 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:528a87e90ff9354581d54fd37fbe9f95cccbcdb1) Merged-In: Ie2f43663bc71a06ffadb868d2d0eea5ee78f76e5 Change-Id: Ie2f43663bc71a06ffadb868d2d0eea5ee78f76e5
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java index 2499529..a79f912 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
@@ -695,6 +695,7 @@ // TODO: switch this back to SecurityException Slog.wtf(TAG, "Not allowed to modify non-dynamic permission " + permName); + return; } mRegistry.removePermission(permName); }