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

Commit d9dd4341 authored by Pascal Mütschard's avatar Pascal Mütschard
Browse files

Tie the jank listener lifetime to the registration. 

This makes sure that the listener doesn't get GC'ed as long as the
registration stays alive. When the listener is GC'ed, it's automatically
removed from the jank tracking API. Since we wrap the listener in the
AttachedSurfaceControl, there are no other references to the listener.

Bug: b/392687889
Test: manual
Flag: EXEMPT bugfix
Change-Id: I6721971fc03df92b14c5fd41a5c2aa828a2b4c93
parent 107fe807

core/java/android/view/SurfaceControl.java

+4 −0
Original line number Diff line number Diff line
@@ -594,6 +594,7 @@ public final class SurfaceControl implements Parcelable { 


        private final Runnable mFreeNativeResources;

        private boolean mRemoved = false;

        private OnJankDataListener mListener;



        private OnJankDataListenerRegistration() {

            mNativeObject = 0;
@@ -604,6 +605,8 @@ public final class SurfaceControl implements Parcelable { 
            mNativeObject = nativeCreateJankDataListenerWrapper(surface.mNativeObject, listener);

            mFreeNativeResources = (mNativeObject == 0) ? () -> {} :

                    sRegistry.registerNativeAllocation(this, mNativeObject);

            // Make sure the listener doesn't get GCed as long as the registration is alive.

            mListener = listener;

        }



        /**
@@ -643,6 +646,7 @@ public final class SurfaceControl implements Parcelable { 
            if (!mRemoved) {

                removeAfter(0);

            }

            mListener = null;

            mFreeNativeResources.run();

        }

    }