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

Commit 1dd9eb59 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: 0928b907 

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



Change-Id: I8c8b6a731cd1c1aa540e9b9c0c1430c2df33716f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f7cf64a0 0928b907

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -49,6 +49,7 @@ import android.view.RoundedCorners; 
import android.view.SurfaceControl;

import android.view.SurfaceControl;





import com.android.internal.R;

import com.android.internal.R;

import com.android.internal.annotations.KeepForWeakReference;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.display.BrightnessSynchronizer;

import com.android.internal.display.BrightnessSynchronizer;

import com.android.internal.util.function.pooled.PooledLambda;

import com.android.internal.util.function.pooled.PooledLambda;
@@ -1442,8 +1443,9 @@ final class LocalDisplayAdapter extends DisplayAdapter { 
    }

    }





    public static class Injector {

    public static class Injector {

        // Native callback.

        // Ensure the callback is kept to preserve native weak reference lifecycle semantics.

        @SuppressWarnings("unused")

        @SuppressWarnings("unused")

        @KeepForWeakReference

        private ProxyDisplayEventReceiver mReceiver;

        private ProxyDisplayEventReceiver mReceiver;

        public void setDisplayEventListenerLocked(Looper looper, DisplayEventListener listener) {

        public void setDisplayEventListenerLocked(Looper looper, DisplayEventListener listener) {

            mReceiver = new ProxyDisplayEventReceiver(looper, listener);

            mReceiver = new ProxyDisplayEventReceiver(looper, listener);