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

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

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

Merge "Keep members that are weakly referenced from native code" into main am: 0928b907 am: 1dd9eb59

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



Change-Id: Ib2ca018ca34f9dc83dbbc323d75e965a1d6f6512
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aa9f1f65 1dd9eb59

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

+3 −1
Original line number Diff line number Diff line
@@ -49,6 +49,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;
@@ -1442,8 +1443,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);