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

Commit eb344c7a authored by Robert Carr's avatar Robert Carr
Browse files

Fix memory leak in SurfaceControl#copyFrom 

Not leaking in practice but if it were used on an already initialized
SurfaceControl Java Wrapper it would leak the old native object by
failing to cal dec strong.

Bug: 111373437
Test: Boots
Change-Id: Ie8f59788630bc2ba05bbdcbbefed4124a4032170
parent 30e984ca

core/java/android/view/SurfaceControl.java

+11 −5
Original line number Diff line number Diff line
@@ -360,11 +360,18 @@ public class SurfaceControl implements Parcelable { 
     */

    public static final int WINDOW_TYPE_DONT_SCREENSHOT = 441731;



    private void assignNativeObject(long nativeObject) {

        if (mNativeObject != 0) {

            release();

        }

        mNativeObject = nativeObject;

    }



    public void copyFrom(SurfaceControl other) {

        mName = other.mName;

        mWidth = other.mWidth;

        mHeight = other.mHeight;

        mNativeObject = nativeCopyFromSurfaceControl(other.mNativeObject);

        assignNativeObject(nativeCopyFromSurfaceControl(other.mNativeObject));

    }



    /**
@@ -685,12 +692,11 @@ public class SurfaceControl implements Parcelable { 
        mWidth = in.readInt();

        mHeight = in.readInt();



        release();

        long object = 0;

        if (in.readInt() != 0) {

            mNativeObject = nativeReadFromParcel(in);

        } else {

            mNativeObject = 0;

            object = nativeReadFromParcel(in);

        }

        assignNativeObject(object);

    }



    @Override