| commit | 2c02137a36d1fc1f2d4bd5f22889294842e9c359 | [log] [tgz] |
|---|---|---|
| author | Yi-an Chen <theianchen@google.com> | Tue Mar 26 18:38:57 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 26 18:38:57 2024 +0000 |
| tree | 01269d96f933967f91131aa1fb7f2e0d7bf6ee34 | |
| parent | 92eaaf425d27b784c8ef3e97d61655d324e38175 [diff] | |
| parent | 54c767b36922a881167a7435f3dacd14476e013f [diff] |
Merge "Fix error handling for non-dynamic permissions" into sc-dev am: e09941cfb2 am: 54c767b369 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26297402 Change-Id: Icc9d5d7efd80a9e2c233567749bb7e97a599c04d 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/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java index dd8b96e..31babe0 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
@@ -691,6 +691,7 @@ // TODO: switch this back to SecurityException Slog.wtf(TAG, "Not allowed to modify non-dynamic permission " + permName); + return; } mRegistry.removePermission(permName); }