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

Commit 7739c287 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "one step toward fixing [2501808] sapphire: OOM in GPU Surface area"

parents e0a29d6f af1e11b8

core/jni/android_view_Surface.cpp

+8 −0
Original line number Original line Diff line number Diff line
@@ -35,6 +35,11 @@ 




namespace android {

namespace android {





enum {

    // should match Parcelable.java

    PARCELABLE_WRITE_RETURN_VALUE = 0x0001

};



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

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





static const char* const OutOfResourcesException =

static const char* const OutOfResourcesException =
@@ -612,6 +617,9 @@ static void Surface_writeToParcel( 




    const sp<SurfaceControl>& control(getSurfaceControl(env, clazz));

    const sp<SurfaceControl>& control(getSurfaceControl(env, clazz));

    SurfaceControl::writeSurfaceToParcel(control, parcel);

    SurfaceControl::writeSurfaceToParcel(control, parcel);

    if (flags & PARCELABLE_WRITE_RETURN_VALUE) {

        setSurfaceControl(env, clazz, 0);

    }

}

}





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

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