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

Commit a90e5fb3 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 am: 63640e75 

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



Change-Id: Ibe503a94250ba4e6fb9c873c7d63676545002ca7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dc2a02e9 63640e75

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

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

            synchronized (this) {

                pinnedApp.mFiles.add(pf);

                mPinnedFiles.put(pf.fileName, pf);

            }



            apkPinSizeLimit -= pf.bytesPinned;
@@ -1341,18 +1342,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();