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

Commit 0928b907 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Keep members that are weakly referenced from native code" into main

parents 0f0bdc23 d1307e7a

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

+3 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 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;
@@ -1394,8 +1395,9 @@ final class LocalDisplayAdapter extends DisplayAdapter { 
    }



    public static class Injector {

        // Native callback.

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