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

Commit b36e5760 authored by Pablo Gamito's avatar Pablo Gamito Committed by Android (Google) Code Review
Browse files

Merge "Convert SurfaceControl parceling to SAFE_PARCEL"

parents e4798145 423daf64

core/jni/android_view_SurfaceControl.cpp

+3 −2
Original line number Diff line number Diff line
@@ -1434,7 +1434,8 @@ static jlong nativeReadFromParcel(JNIEnv* env, jclass clazz, jobject parcelObj) 
        doThrowNPE(env);

        return 0;

    }

    sp<SurfaceControl> surface = SurfaceControl::readFromParcel(parcel);

    sp<SurfaceControl> surface;

    SurfaceControl::readFromParcel(*parcel, &surface);

    if (surface == nullptr) {

        return 0;

    }
@@ -1462,7 +1463,7 @@ static void nativeWriteToParcel(JNIEnv* env, jclass clazz, 
    }

    SurfaceControl* const self = reinterpret_cast<SurfaceControl *>(nativeObject);

    if (self != nullptr) {

        self->writeToParcel(parcel);

        self->writeToParcel(*parcel);

    }

}