commit 37ecc16063519d74796114f7e82e8f79ebb7378f
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jul 15 04:39:24 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 15 04:39:24 2024 +0000
tree d25dd426650b168e540b95efaed491c64c9d7c89
parent 2bebdf21843f84cf3fc62991b12f5bc51be8ad76
parent 84151ce59f74aff1e3bda2942fa997ad25a1257a

Merge "Keep packagemonitor for weak reference in overlaymanagerservice" into main

services/core/java/com/android/server/om/OverlayManagerService.java

diff --git a/services/core/java/com/android/server/om/OverlayManagerService.java b/services/core/java/com/android/server/om/OverlayManagerService.java
index 56e4590..46585a5 100644
--- a/services/core/java/com/android/server/om/OverlayManagerService.java
+++ b/services/core/java/com/android/server/om/OverlayManagerService.java
@@ -80,6 +80,7 @@
 import android.util.Slog;
 import android.util.SparseArray;
 
+import com.android.internal.annotations.KeepForWeakReference;
 import com.android.internal.content.PackageMonitor;
 import com.android.internal.content.om.OverlayConfig;
 import com.android.internal.util.ArrayUtils;
@@ -261,6 +262,7 @@
 
     private final OverlayActorEnforcer mActorEnforcer;
 
+    @KeepForWeakReference
     private final PackageMonitor mPackageMonitor = new OverlayManagerPackageMonitor();
 
     private int mPrevStartedUserId = -1;