commit e20a754bdf8468f9eca5f13199590353070c8e9c
author John Reck <jreck@google.com> Wed Feb 09 08:56:56 2022 -0500
committer John Reck <jreck@google.com> Wed Feb 09 08:56:56 2022 -0500
tree 72d427e3653c3798fce9737e265411bab9a24a77
parent b42de79509444544b5077d8653b1bfb1fd44b932

Fix setLongField -> setIntField

Fixes: 218599859
Test: atest com.android.server.wm.utils.RotationAnimationUtilsTest#whiteLuma
Change-Id: I0b126a12cdc2a6774ee58c2fdce0db4d52b677e6

media/jni/android_media_ImageReader.cpp

diff --git a/media/jni/android_media_ImageReader.cpp b/media/jni/android_media_ImageReader.cpp
index 4d6739e..31e1817 100644
--- a/media/jni/android_media_ImageReader.cpp
+++ b/media/jni/android_media_ImageReader.cpp
@@ -623,7 +623,7 @@
     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

diff --git a/media/jni/android_media_ImageWriter.cpp b/media/jni/android_media_ImageWriter.cpp
index 0f88afb..6c6fccb 100644
--- a/media/jni/android_media_ImageWriter.cpp
+++ b/media/jni/android_media_ImageWriter.cpp
@@ -901,7 +901,7 @@
 
     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) {