| commit | ff8132eadebf7db6123832cdd9d90d1f8f532c10 | [log] [tgz] |
|---|---|---|
| author | Yi-an Chen <theianchen@google.com> | Fri Mar 22 19:12:00 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 22 19:12:00 2024 +0000 |
| tree | 0d8966bdd306c97b4b531610b2fa83d5a50c488c | |
| parent | 9ac3050641ac3cdbe2123697819d613be4e33309 [diff] | |
| parent | d329b516fbae0ec33409828f5c000fcf0a8713e8 [diff] |
Merge "Fix error handling for non-dynamic permissions" into tm-dev am: 89c545f41b am: d329b516fb Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26307234 Change-Id: I3017a9b1ee5ee231fa1446db1c1b38bca8eeffca 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/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java index 8dadd31..96c34db 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
@@ -678,6 +678,7 @@ // TODO: switch this back to SecurityException Slog.wtf(TAG, "Not allowed to modify non-dynamic permission " + permName); + return; } mRegistry.removePermission(permName); }