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

Commit f7f7aa0a 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:... 

Merge "Fix error handling for non-dynamic permissions" into tm-dev am: 89c545f4 am: b8d6800e am: 4a5d6153 am: 47a2bea3

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



Change-Id: Ie2289a24f946b1feceae7520467b37b35934d0c9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cd61d98f 47a2bea3

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

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

        }