commit e09941cfb279619aa79ba844f7daed1c742df382
author Yi-an Chen <theianchen@google.com> Tue Mar 26 18:10:07 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 26 18:10:07 2024 +0000
tree 90a3d6eae73699eb8c717f375bdfaf99a0e256e6
parent 5b6950734db7da42cb2706a635307c53f9a7b70f
parent 2b5d63b64b2b8208ccc4f62eac3d8962f981dbf8

Merge "Fix error handling for non-dynamic permissions" into sc-dev

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

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);
         }