summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-09-28 19:55:16 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-09-28 19:55:16 +0000
commitce36021dfe5a01c29c8c43ac56d34f2f88e0bb49 (patch)
treeeca9688d4e8eb67c0e15088316a5d2d59a88051d
parent63877fa32dfe71a96e95668c9d22870568623b45 (diff)
parent340f8b10080df7a258075e4e79bc4402fda5ddba (diff)
Merge "Remove use of SkGainmapInfo::Type" into main
-rw-r--r--libs/hwui/jni/Gainmap.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/libs/hwui/jni/Gainmap.cpp b/libs/hwui/jni/Gainmap.cpp
index cec0ee7ee247..0fffee744be0 100644
--- a/libs/hwui/jni/Gainmap.cpp
+++ b/libs/hwui/jni/Gainmap.cpp
@@ -208,8 +208,6 @@ static void Gainmap_writeToParcel(JNIEnv* env, jobject, jlong nativeObject, jobj
p.writeFloat(info.fDisplayRatioHdr);
// base image type
p.writeInt32(static_cast<int32_t>(info.fBaseImageType));
- // type
- p.writeInt32(static_cast<int32_t>(info.fType));
#else
doThrowRE(env, "Cannot use parcels outside of Android!");
#endif
@@ -232,7 +230,6 @@ static void Gainmap_readFromParcel(JNIEnv* env, jobject, jlong nativeObject, job
info.fDisplayRatioSdr = p.readFloat();
info.fDisplayRatioHdr = p.readFloat();
info.fBaseImageType = static_cast<SkGainmapInfo::BaseImageType>(p.readInt32());
- info.fType = static_cast<SkGainmapInfo::Type>(p.readInt32());
fromJava(nativeObject)->info = info;
#else