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

This commit is contained in:
TreeHugger Robot
2021-03-22 15:49:13 +00:00
committed by Android (Google) Code Review

View File

@@ -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