Merge "Load fallback categories earlier" into pi-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
d688e7b15d
@@ -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);
|
||||
@@ -3239,10 +3243,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.
|
||||
|
||||
Reference in New Issue
Block a user