Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff8132ea authored by Yi-an Chen's avatar Yi-an Chen Committed by Automerger Merge Worker
Browse files

Merge "Fix error handling for non-dynamic permissions" into tm-dev am: 89c545f4 am: d329b516 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26307234



Change-Id: I3017a9b1ee5ee231fa1446db1c1b38bca8eeffca
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9ac30506 d329b516

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

+1 −0
Original line number Diff line number Diff line
@@ -678,6 +678,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);

        }