diff options
| author | 2024-03-22 19:43:12 +0000 | |
|---|---|---|
| committer | 2024-03-22 19:43:12 +0000 | |
| commit | f7f7aa0a4c749e788aab7b6da0e5f7b57e62976c (patch) | |
| tree | ced6aa0fbe83c3422d97eb29c763fb1b6c8e4259 | |
| parent | cd61d98ff290ce611b009d55699607f46c6e550f (diff) | |
| parent | 47a2bea3ace5b5d3c821f72ce1c7a26e4fb8e6c7 (diff) | |
Merge "Fix error handling for non-dynamic permissions" into tm-dev am: 89c545f41b am: b8d6800eed am: 4a5d61532d am: 47a2bea3ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26307234
Change-Id: Ie2289a24f946b1feceae7520467b37b35934d0c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java | 1 |
1 files changed, 1 insertions, 0 deletions
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 2499529f0fc0..a79f912747cd 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 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt // TODO: switch this back to SecurityException Slog.wtf(TAG, "Not allowed to modify non-dynamic permission " + permName); + return; } mRegistry.removePermission(permName); } |