commit a90e5fb3e9deaeb658a50debcc71c799703a7e6c
author Edgar Arriaga García <edgararriaga@google.com> Wed May 15 19:15:34 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 15 19:15:34 2024 +0000
tree 9101f9a30470e1ecbe1543c5cae720d0d2814c66
parent dc2a02e9a3eb9efd265905270ed4ce8238841f76
parent 63640e75bb640af4a144f670aa7a67ca6058f8b8

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

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

Change-Id: Ibe503a94250ba4e6fb9c873c7d63676545002ca7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

diff --git a/services/core/java/com/android/server/PinnerService.java b/services/core/java/com/android/server/PinnerService.java
index d04dbc2..d9e6186 100644
--- a/services/core/java/com/android/server/PinnerService.java
+++ b/services/core/java/com/android/server/PinnerService.java
@@ -870,6 +870,7 @@
             }
             synchronized (this) {
                 pinnedApp.mFiles.add(pf);
+                mPinnedFiles.put(pf.fileName, pf);
             }
 
             apkPinSizeLimit -= pf.bytesPinned;
@@ -1341,18 +1342,6 @@
 
     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();