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

Commit 4c564338 authored by Todd Kennedy's avatar Todd Kennedy Committed by android-build-merger
Browse files

Merge "Load fallback categories earlier" into pi-dev am: d688e7b1 

am: 392bef03

Change-Id: Ica94aa7bee606451e1d361b3e71a487b9cfdf6af
parents c55b5def 392bef03

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

+4 −4
Original line number Diff line number Diff line
@@ -2499,6 +2499,10 @@ public class PackageManagerService extends IPackageManager.Stub 














            SELinuxMMAC.readInstallPolicy();



























            Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "loadFallbacks");













            FallbackCategoryProvider.loadFallbacks();













            Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);



























            Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "read user settings");















            mFirstBoot = !mSettings.readLPw(sUserManager.getUsers(false));















            Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);










@@ -3243,10 +3247,6 @@ public class PackageManagerService extends IPackageManager.Stub













        Runtime.getRuntime().gc();















        Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);



























        Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "loadFallbacks");













        FallbackCategoryProvider.loadFallbacks();













        Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);



























        // The initial scanning above does many calls into installd while















        // holding the mPackages lock, but we're mostly interested in yelling















        // once we have a booted system.