diff options
| author | 2018-04-17 20:21:30 +0000 | |
|---|---|---|
| committer | 2018-04-17 20:21:30 +0000 | |
| commit | d688e7b15dd3ee56da34b146ba5ee0271a2cb6cb (patch) | |
| tree | c1ac8c8f794cdba5ba8f8f32237d55c28efe5d1f | |
| parent | 7b3e68232c37e061010d7538beb6fff9893230eb (diff) | |
| parent | a63d57ab65eea9c74c12fde7fd970fd6f67579ae (diff) | |
Merge "Load fallback categories earlier" into pi-dev
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 33264c88ade6..485d0f242977 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -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. |