commit c4f1bc40326c10fde55f07230e3fe3067d70fbfa
author David Brazdil <dbrazdil@google.com> Thu Jun 02 16:16:25 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 02 16:16:27 2016 +0000
tree 48f6b0aef5fe9c0a9fe74a1104f00d2a2d056d14
parent 09ca7e73c0e3384a57e4e4fc7c25fd52ca540d98
parent 89c80bb631d51e2d9947e9e1ccbe328b971d2476

Merge "Do not update packages in encrypted state" into nyc-dev

services/java/com/android/server/SystemServer.java

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index eed4351..476a559 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -701,13 +701,15 @@
         // as appropriate.
         mSystemServiceManager.startService(UiModeManagerService.class);
 
-        Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "UpdatePackagesIfNeeded");
-        try {
-            mPackageManagerService.updatePackagesIfNeeded();
-        } catch (Throwable e) {
-            reportWtf("update packages", e);
+        if (!mOnlyCore) {
+            Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "UpdatePackagesIfNeeded");
+            try {
+                mPackageManagerService.updatePackagesIfNeeded();
+            } catch (Throwable e) {
+                reportWtf("update packages", e);
+            }
+            Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
         }
-        Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
 
         Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "PerformFstrimIfNeeded");
         try {