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

Commit 72193975 authored by Vishnu Nair's avatar Vishnu Nair Committed by Android (Google) Code Review
Browse files

Merge "Surface: Release references to BlastBufferQueue and SurfaceControl on... 

Merge "Surface: Release references to BlastBufferQueue and SurfaceControl on Surface#destroy" into sc-qpr1-dev
parents d48c1b10 aacc61be

core/java/android/view/Surface.java

+4 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ public class Surface implements Parcelable { 


    private static native int nativeSetFrameRate(

            long nativeObject, float frameRate, int compatibility, int changeFrameRateStrategy);

    private static native void nativeDestroy(long nativeObject);



    public static final @android.annotation.NonNull Parcelable.Creator<Surface> CREATOR =

            new Parcelable.Creator<Surface>() {
@@ -339,6 +340,9 @@ public class Surface implements Parcelable { 
     */

    @UnsupportedAppUsage

    public void destroy() {

        if (mNativeObject != 0) {

            nativeDestroy(mNativeObject);

        }

        release();

    }

core/java/android/view/SurfaceView.java

+1 −1
Original line number Diff line number Diff line
@@ -903,7 +903,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall 
        mSurfaceAlpha = 1f;



        synchronized (mSurfaceControlLock) {

            mSurface.release();

            mSurface.destroy();

            if (mBlastBufferQueue != null) {

                mBlastBufferQueue.destroy();

                mBlastBufferQueue = null;

core/jni/android_view_Surface.cpp

+6 −0
Original line number Diff line number Diff line
@@ -449,6 +449,11 @@ static jint nativeSetFrameRate(JNIEnv* env, jclass clazz, jlong nativeObject, jf 
                        int(changeFrameRateStrategy));

}



static void nativeDestroy(JNIEnv* env, jclass clazz, jlong nativeObject) {

    sp<Surface> surface(reinterpret_cast<Surface*>(nativeObject));

    surface->destroy();

}



// ----------------------------------------------------------------------------



static const JNINativeMethod gSurfaceMethods[] = {
@@ -477,6 +482,7 @@ static const JNINativeMethod gSurfaceMethods[] = { 
        {"nativeSetAutoRefreshEnabled", "(JZ)I", (void*)nativeSetAutoRefreshEnabled},

        {"nativeSetFrameRate", "(JFII)I", (void*)nativeSetFrameRate},

        {"nativeGetFromBlastBufferQueue", "(JJ)J", (void*)nativeGetFromBlastBufferQueue},

        {"nativeDestroy", "(J)V", (void*)nativeDestroy},

};



int register_android_view_Surface(JNIEnv* env)