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

Commit ff46d9fa authored by David Brazdil's avatar David Brazdil Committed by android-build-merger
Browse files

Merge "Do not update packages in encrypted state" into nyc-dev am: c4f1bc40 am: a5e81480 

am: 2a7c8c80

* commit '2a7c8c80':
  Do not update packages in encrypted state

Change-Id: Ib0c5e3b003769c150631c7768918552902124456
parents b06c8adf 2a7c8c80

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

+8 −6
Original line number Diff line number Diff line
@@ -706,6 +706,7 @@ public final class SystemServer { 
        // as appropriate.

        mSystemServiceManager.startService(UiModeManagerService.class);



        if (!mOnlyCore) {

            Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "UpdatePackagesIfNeeded");

            try {

                mPackageManagerService.updatePackagesIfNeeded();
@@ -713,6 +714,7 @@ public final class SystemServer { 
                reportWtf("update packages", e);

            }

            Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);

        }



        Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "PerformFstrimIfNeeded");

        try {