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

Commit db48450e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix parsing sCachedPackageReadCount" into rvc-dev

parents 719e2c7a 46220780
Loading
Loading
Loading
Loading
+0 −6
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;

/**
 * Parser for package files (APKs) on disk. This supports apps packaged either
@@ -239,11 +238,6 @@ public class PackageParser {

    public static final boolean LOG_UNSAFE_BROADCASTS = false;

    /**
     * Total number of packages that were read from the cache.  We use it only for logging.
     */
    public static final AtomicInteger sCachedPackageReadCount = new AtomicInteger();

    // Set of broadcast actions that are safe for manifest receivers
    public static final Set<String> SAFE_BROADCASTS = new ArraySet<>();
    static {
+2 −2
Original line number Diff line number Diff line
@@ -3181,7 +3181,7 @@ public class PackageManagerService extends IPackageManager.Stub
                }
            }
            final int cachedSystemApps = PackageParser.sCachedPackageReadCount.get();
            final int cachedSystemApps = PackageCacher.sCachedPackageReadCount.get();
            // Remove any shared userIDs that have no associated packages
            mSettings.pruneSharedUsersLPw();
@@ -3315,7 +3315,7 @@ public class PackageManagerService extends IPackageManager.Stub
                // This must be done last to ensure all stubs are replaced or disabled.
                installSystemStubPackages(stubSystemApps, scanFlags);
                final int cachedNonSystemApps = PackageParser.sCachedPackageReadCount.get()
                final int cachedNonSystemApps = PackageCacher.sCachedPackageReadCount.get()
                                - cachedSystemApps;
                final long dataScanTime = SystemClock.uptimeMillis() - systemScanTime - startTime;