diff options
8 files changed, 3 insertions, 18 deletions
diff --git a/core/java/com/android/internal/content/PackageMonitor.java b/core/java/com/android/internal/content/PackageMonitor.java index ad7329485a0e..4663d62896a2 100644 --- a/core/java/com/android/internal/content/PackageMonitor.java +++ b/core/java/com/android/internal/content/PackageMonitor.java @@ -36,6 +36,7 @@ import android.util.Log; import android.util.Slog; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.annotations.WeaklyReferencedCallback; import com.android.internal.os.BackgroundThread; import java.lang.ref.WeakReference; @@ -46,6 +47,7 @@ import java.util.concurrent.Executor; * Helper class for monitoring the state of packages: adding, removing, * updating, and disappearing and reappearing on the SD card. */ +@WeaklyReferencedCallback public abstract class PackageMonitor extends android.content.BroadcastReceiver { static final String TAG = "PackageMonitor"; diff --git a/native/android/OWNERS b/native/android/OWNERS index 3ea2d3506f31..1e8d30d1681c 100644 --- a/native/android/OWNERS +++ b/native/android/OWNERS @@ -6,8 +6,7 @@ per-file libandroid.map.txt = jreck@google.com, zyy@google.com, mattbuckley@goog # Networking per-file libandroid_net.map.txt, net.c = set noparent -per-file libandroid_net.map.txt, net.c = codewiz@google.com, jchalard@google.com, junyulai@google.com -per-file libandroid_net.map.txt, net.c = lorenzo@google.com, reminv@google.com, satk@google.com +per-file libandroid_net.map.txt, net.c = file:platform/packages/modules/Connectivity:main:/OWNERS_core_networking # Fonts per-file system_fonts.cpp = file:/graphics/java/android/graphics/fonts/OWNERS diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java index 34d59d86bead..ca2eb2314fc3 100644 --- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java +++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java @@ -49,7 +49,6 @@ import android.view.RoundedCorners; import android.view.SurfaceControl; import com.android.internal.R; -import com.android.internal.annotations.KeepForWeakReference; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.display.BrightnessSynchronizer; import com.android.internal.util.function.pooled.PooledLambda; @@ -1468,9 +1467,7 @@ final class LocalDisplayAdapter extends DisplayAdapter { } public static class Injector { - // Ensure the callback is kept to preserve native weak reference lifecycle semantics. @SuppressWarnings("unused") - @KeepForWeakReference private ProxyDisplayEventReceiver mReceiver; public void setDisplayEventListenerLocked(Looper looper, DisplayEventListener listener) { mReceiver = new ProxyDisplayEventReceiver(looper, listener); diff --git a/services/core/java/com/android/server/locales/LocaleManagerService.java b/services/core/java/com/android/server/locales/LocaleManagerService.java index 741513cf3c0b..cc0a7340494c 100644 --- a/services/core/java/com/android/server/locales/LocaleManagerService.java +++ b/services/core/java/com/android/server/locales/LocaleManagerService.java @@ -48,7 +48,6 @@ import android.util.AtomicFile; import android.util.Slog; import android.util.Xml; -import com.android.internal.annotations.KeepForWeakReference; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.content.PackageMonitor; import com.android.internal.util.FrameworkStatsLog; @@ -101,7 +100,6 @@ public class LocaleManagerService extends SystemService { private LocaleManagerBackupHelper mBackupHelper; - @KeepForWeakReference private final PackageMonitor mPackageMonitor; private final Object mWriteLock = new Object(); diff --git a/services/core/java/com/android/server/om/OverlayManagerService.java b/services/core/java/com/android/server/om/OverlayManagerService.java index 6303ecd53dbb..253365fba595 100644 --- a/services/core/java/com/android/server/om/OverlayManagerService.java +++ b/services/core/java/com/android/server/om/OverlayManagerService.java @@ -81,7 +81,6 @@ import android.util.Slog; import android.util.SparseArray; import com.android.internal.annotations.GuardedBy; -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; @@ -263,7 +262,6 @@ public final class OverlayManagerService extends SystemService { private final OverlayActorEnforcer mActorEnforcer; - @KeepForWeakReference private final PackageMonitor mPackageMonitor = new OverlayManagerPackageMonitor(); private int mPrevStartedUserId = -1; diff --git a/services/core/java/com/android/server/sensorprivacy/SensorPrivacyService.java b/services/core/java/com/android/server/sensorprivacy/SensorPrivacyService.java index 16658e360cba..a64e38e60ad1 100644 --- a/services/core/java/com/android/server/sensorprivacy/SensorPrivacyService.java +++ b/services/core/java/com/android/server/sensorprivacy/SensorPrivacyService.java @@ -131,7 +131,6 @@ import android.util.proto.ProtoOutputStream; import com.android.internal.R; import com.android.internal.annotations.GuardedBy; -import com.android.internal.annotations.KeepForWeakReference; import com.android.internal.camera.flags.Flags; import com.android.internal.messages.nano.SystemMessageProto.SystemMessage; import com.android.internal.os.BackgroundThread; @@ -2008,11 +2007,7 @@ public final class SensorPrivacyService extends SystemService { } private class CallStateHelper { - // TelephonyCallback instances are only weakly referenced when registered, so we need - // to ensure these fields are kept during optimization to preserve lifecycle semantics. - @KeepForWeakReference private final OutgoingEmergencyStateCallback mEmergencyStateCallback; - @KeepForWeakReference private final CallStateCallback mCallStateCallback; private boolean mIsInEmergencyCall; diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 96b924336881..5d4c42605e1d 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -359,7 +359,6 @@ import android.window.WindowOnBackInvokedDispatcher; import com.android.internal.R; import com.android.internal.annotations.GuardedBy; -import com.android.internal.annotations.KeepForWeakReference; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.app.ResolverActivity; import com.android.internal.content.ReferrerIntent; @@ -895,8 +894,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A private RemoteCallbackList<IScreenCaptureObserver> mCaptureCallbacks; - // Ensure the field is kept during optimization to preserve downstream weak refs. - @KeepForWeakReference private final ColorDisplayService.ColorTransformController mColorTransformController = (matrix, translation) -> mWmService.mH.post(() -> { synchronized (mWmService.mGlobalLock) { diff --git a/services/core/jni/BroadcastRadio/OWNERS b/services/core/jni/BroadcastRadio/OWNERS index ea4421eae96a..a993823f88f7 100644 --- a/services/core/jni/BroadcastRadio/OWNERS +++ b/services/core/jni/BroadcastRadio/OWNERS @@ -1,2 +1 @@ twasilczyk@google.com -randolphs@google.com |