diff options
| author | Todd Kennedy <toddke@google.com> | 2018-04-17 14:50:27 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-04-17 14:50:27 -0700 |
| commit | 392bef038a68d8ffdb5fcb655edf28f12c5f888c (patch) | |
| tree | 2a0bf9b30bd8b86f8c7ac60144f61bc9f0218393 | |
| parent | 299c18fe4d98cc058df14ee168ddf4c7b17a8bf2 (diff) | |
| parent | d688e7b15dd3ee56da34b146ba5ee0271a2cb6cb (diff) | |
Merge "Load fallback categories earlier" into pi-dev
am: d688e7b15d
Change-Id: I863c71a204d87e6d91229f553986efd708722324
| -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 40c179f19697..1d140fbc93ec 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. |