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

Commit 63640e75 authored by Edgar Arriaga García's avatar Edgar Arriaga García Committed by Automerger Merge Worker
Browse files

Merge "Pinned apk file should be put in mPinnedFiles." into main am: 3a542f99 

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



Change-Id: I2d0e080d4039ee4d8565dfdef47824246e573a33
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 29d6d7ee 3a542f99

services/core/java/com/android/server/PinnerService.java

+1 −12
Original line number Diff line number Diff line
@@ -885,6 +885,7 @@ public final class PinnerService extends SystemService { 
            }

            synchronized (this) {

                pinnedApp.mFiles.add(pf);

                mPinnedFiles.put(pf.fileName, pf);

            }



            apkPinSizeLimit -= pf.bytesPinned;
@@ -1356,18 +1357,6 @@ public final class PinnerService extends SystemService { 


    public List<PinnedFileStat> getPinnerStats() {

        ArrayList<PinnedFileStat> stats = new ArrayList<>();

        Collection<PinnedApp> pinnedApps;

        synchronized(this) {

            pinnedApps = mPinnedApps.values();

        }

        for (PinnedApp pinnedApp : pinnedApps) {

            for (PinnedFile pf : pinnedApp.mFiles) {

                PinnedFileStat stat =

                        new PinnedFileStat(pf.fileName, pf.bytesPinned, pf.groupName);

                stats.add(stat);

            }

        }



        Collection<PinnedFile> pinnedFiles;

        synchronized(this) {

            pinnedFiles = mPinnedFiles.values();