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

Commit be06348f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix all runtime permissions being considered changing protection from... 

Merge "Fix all runtime permissions being considered changing protection from non-runtime on first boot." into sc-dev am: 2357d702

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

Change-Id: Ie8e2419952d94afdde0c85803e018c38c86738b3
parents bae20e42 2357d702

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

+2 −1
Original line number Diff line number Diff line
@@ -435,11 +435,12 @@ public final class Permission { 
                }

            }

        }

        boolean wasNonRuntime = permission != null && permission.mType != TYPE_CONFIG

                && !permission.isRuntime();

        if (permission == null) {

            permission = new Permission(permissionInfo.name, permissionInfo.packageName,

                    TYPE_MANIFEST);

        }

        boolean wasNonRuntime = !permission.isRuntime();

        StringBuilder r = null;

        if (!permission.mReconciled) {

            if (permission.mPermissionInfo.packageName == null