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

Commit 6c22d6c1 authored by Yi-an Chen's avatar Yi-an Chen Committed by Android Build Coastguard Worker
Browse files

Fix error handling for non-dynamic permissions 

We only allow removing dynamic permissions. When removePermission() is
called for a non-dynamic permission, in addition to logging it, we
should also return early to avoid the removePermission() call.

Test: manual
Bug: 321555066
Fixes: 321711213
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:528a87e90ff9354581d54fd37fbe9f95cccbcdb1)
Merged-In: Ie2f43663bc71a06ffadb868d2d0eea5ee78f76e5
Change-Id: Ie2f43663bc71a06ffadb868d2d0eea5ee78f76e5
parent 0a645bd7

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

        }