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

Commit dc5291eb authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Fix setLongField -> setIntField"

parents e7e3dd67 e20a754b

media/jni/android_media_ImageReader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ static jint ImageReader_imageSetup(JNIEnv* env, jobject thiz, jobject image, 
    Image_setBufferItem(env, image, buffer);

    env->SetLongField(image, gSurfaceImageClassInfo.mTimestamp,

            static_cast<jlong>(buffer->mTimestamp));

    env->SetLongField(image, gSurfaceImageClassInfo.mDataSpace,

    env->SetIntField(image, gSurfaceImageClassInfo.mDataSpace,

            static_cast<jint>(buffer->mDataSpace));

    auto transform = buffer->mTransform;

    if (buffer->mTransformToDisplayInverse) {

media/jni/android_media_ImageWriter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -901,7 +901,7 @@ static void Image_setNativeContext(JNIEnv* env, jobject thiz, 


    env->SetIntField(thiz, gSurfaceImageClassInfo.mNativeFenceFd, reinterpret_cast<jint>(fenceFd));



    env->SetLongField(thiz, gSurfaceImageClassInfo.mDataSpace, dataSpace);

    env->SetIntField(thiz, gSurfaceImageClassInfo.mDataSpace, dataSpace);

}



static void Image_unlockIfLocked(JNIEnv* env, jobject thiz) {