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

Commit 32a55a6a authored by Hai Zhang's avatar Hai Zhang Committed by Automerger Merge Worker
Browse files

Merge "Read permission state before scanning packages." into sc-qpr1-dev am:... 

Merge "Read permission state before scanning packages." into sc-qpr1-dev am: ed6134be am: 364ac0f3

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

Change-Id: I0771c63c98d9a642ad5cbc8383032442fc2623e3
parents 501321b6 364ac0f3

services/core/java/com/android/server/pm/PackageManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -7220,6 +7220,7 @@ public class PackageManagerService extends IPackageManager.Stub 
            t.traceEnd();















            mPermissionManager.readLegacyPermissionsTEMP(mSettings.mPermissions);













            mPermissionManager.readLegacyPermissionStateTEMP();





























            if (!mOnlyCore && mFirstBoot) {















                requestCopyPreoptedFiles(mInjector);










@@ -7635,7 +7636,6 @@ public class PackageManagerService extends IPackageManager.Stub













                    + ((SystemClock.uptimeMillis()-startTime)/1000f)















                    + " seconds");



























            mPermissionManager.readLegacyPermissionStateTEMP();















            // If the build fingerprint has changed since the last time we booted,















            // we need to re-grant app permission to catch any new ones that















            // appear.  This is really a hack, and means that apps can in some