summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sally Qi <sallyqi@google.com> 2024-10-07 10:35:26 -0700
committer Sally Qi <sallyqi@google.com> 2024-10-15 23:27:49 -0700
commit63d8edcc943ec87e7514ab7432e991ef124dfa7e (patch)
tree25918da4f07aca2726726e896c12fe8dee7afcba
parent480405c55b4229d80ad6ca5a6e7fcdca6e7a76f0 (diff)
[Lut API] LUT java interface update.
- LutProperties#getSize return integer instead. Bug: 349667978 Test: builds Flag: NONE new added apis are all hidden now Change-Id: I0913bb1b40b6e395d06f389ef6aaab96bf742b68
-rw-r--r--core/java/android/hardware/LutProperties.java6
-rw-r--r--core/jni/android_hardware_OverlayProperties.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/hardware/LutProperties.java b/core/java/android/hardware/LutProperties.java
index 57f8a4ece304..c9c6d6d08ed2 100644
--- a/core/java/android/hardware/LutProperties.java
+++ b/core/java/android/hardware/LutProperties.java
@@ -30,7 +30,7 @@ import java.lang.annotation.RetentionPolicy;
*/
public final class LutProperties {
private final @Dimension int mDimension;
- private final long mSize;
+ private final int mSize;
private final @SamplingKey int[] mSamplingKeys;
@Retention(RetentionPolicy.SOURCE)
@@ -68,7 +68,7 @@ public final class LutProperties {
/**
* @return the size of the Lut.
*/
- public long getSize() {
+ public int getSize() {
return mSize;
}
@@ -83,7 +83,7 @@ public final class LutProperties {
}
/* use in the native code */
- private LutProperties(@Dimension int dimension, long size, @SamplingKey int[] samplingKeys) {
+ private LutProperties(@Dimension int dimension, int size, @SamplingKey int[] samplingKeys) {
if (dimension != ONE_DIMENSION || dimension != THREE_DIMENSION) {
throw new IllegalArgumentException("The dimension is either 1 or 3!");
}
diff --git a/core/jni/android_hardware_OverlayProperties.cpp b/core/jni/android_hardware_OverlayProperties.cpp
index 63de1950f2a5..bb4084e8f39e 100644
--- a/core/jni/android_hardware_OverlayProperties.cpp
+++ b/core/jni/android_hardware_OverlayProperties.cpp
@@ -213,6 +213,6 @@ int register_android_hardware_OverlayProperties(JNIEnv* env) {
clazz = FindClassOrDie(env, "android/hardware/LutProperties");
gLutPropertiesClassInfo.clazz = MakeGlobalRefOrDie(env, clazz);
gLutPropertiesClassInfo.ctor =
- GetMethodIDOrDie(env, gLutPropertiesClassInfo.clazz, "<init>", "(IJ[I)V");
+ GetMethodIDOrDie(env, gLutPropertiesClassInfo.clazz, "<init>", "(II[I)V");
return err;
}