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

Commit 2ef14fd9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Clean up KeepForWeakReference usage" into main am: cc109611 am: 7d6f9d49 

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



Change-Id: I450afae06be0bb3b40cfc120316814d1c4ae7cd8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 44784ed5 7d6f9d49

core/java/com/android/internal/content/PackageMonitor.java

+2 −0
Original line number Diff line number Diff line
@@ -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";

services/core/java/com/android/server/display/LocalDisplayAdapter.java

+0 −3
Original line number Diff line number Diff line
@@ -51,7 +51,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;
@@ -1548,9 +1547,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);

services/core/java/com/android/server/locales/LocaleManagerService.java

+0 −2
Original line number Diff line number Diff line
@@ -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();

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

+0 −2
Original line number Diff line number Diff line
@@ -82,7 +82,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;
@@ -267,7 +266,6 @@ public final class OverlayManagerService extends SystemService { 


    private final OverlayActorEnforcer mActorEnforcer;



    @KeepForWeakReference

    private final PackageMonitor mPackageMonitor = new OverlayManagerPackageMonitor();



    private int mPrevStartedUserId = -1;

services/core/java/com/android/server/sensorprivacy/SensorPrivacyService.java

+0 −5
Original line number Diff line number Diff line
@@ -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;