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

Commit 94d3fe79 authored by Songchun Fan's avatar Songchun Fan Committed by Automerger Merge Worker
Browse files

[pm] fix hidden system packages' loading progress on reboot am: 2b0b5fe0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13547659

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86129f035860b25f45f575c50b03800ce071635d
parents 68a5d72f 2b0b5fe0

services/core/java/com/android/server/pm/Settings.java

+6 −2
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ import android.os.SystemClock; 
import android.os.Trace;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.incremental.IncrementalManager;

import android.os.storage.StorageManager;

import android.os.storage.VolumeInfo;

import android.service.pm.PackageServiceDumpProto;
@@ -2615,6 +2614,8 @@ public final class Settings implements Watchable, Snappable { 
        } else {

            serializer.attributeInt(null, "sharedUserId", pkg.appId);

        }

        serializer.attributeFloat(null, "loadingProgress",

                pkg.getIncrementalStates().getProgress());



        writeUsesStaticLibLPw(serializer, pkg.usesStaticLibraries, pkg.usesStaticLibrariesVersions);
@@ -3400,6 +3401,9 @@ public final class Settings implements Watchable, Snappable { 
        if (ps.appId <= 0) {

            ps.appId = parser.getAttributeInt(null, "sharedUserId", 0);

        }

        final float loadingProgress =

                parser.getAttributeFloat(null, "loadingProgress", 0);

        ps.setLoadingProgress(loadingProgress);



        int outerDepth = parser.getDepth();

        int type;
@@ -4593,7 +4597,7 @@ public final class Settings implements Watchable, Snappable { 
            pw.print(prefix); pw.print("  installerAttributionTag=");

            pw.println(ps.installSource.installerAttributionTag);

        }

        if (IncrementalManager.isIncrementalPath(ps.getPathString())) {

        if (ps.isPackageLoading()) {

            pw.print(prefix); pw.println("  loadingProgress="

                    + (int) (ps.getIncrementalStates().getProgress() * 100) + "%");

        }