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

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

Merge "Keep members needed for downstream weak refs" into main am: e380004d am: db8a61da 

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



Change-Id: Iefd0304a711247e1a0244521c18a272040d7f8ed
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b1b7d01b db8a61da

location/java/com/android/internal/location/GpsNetInitiatedHandler.java

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.telephony.TelephonyManager; 
import android.telephony.emergency.EmergencyNumber;

import android.util.Log;



import com.android.internal.annotations.KeepForWeakReference;

import com.android.internal.telephony.flags.Flags;



import java.util.concurrent.TimeUnit;
@@ -94,6 +95,7 @@ public class GpsNetInitiatedHandler { 


    // The internal implementation of TelephonyManager uses WeakReference so we have to keep a

    // reference here.

    @KeepForWeakReference

    private final EmergencyCallListener mEmergencyCallListener = new EmergencyCallListener();



    private final EmergencyCallCallback mEmergencyCallCallback;

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

+7 −2
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ 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;
@@ -1944,8 +1945,12 @@ public final class SensorPrivacyService extends SystemService { 
    }



    private class CallStateHelper {

        private OutgoingEmergencyStateCallback mEmergencyStateCallback;

        private CallStateCallback mCallStateCallback;

        // 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;

        private boolean mMicUnmutedForEmergencyCall;

services/core/java/com/android/server/wm/ActivityRecord.java

+3 −0
Original line number Diff line number Diff line
@@ -364,6 +364,7 @@ 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;
@@ -921,6 +922,8 @@ 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) {