summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2021-07-08 20:30:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-07-08 20:30:32 +0000
commit08f997ee4d34d39e508cb0f758e8d41536cffd1f (patch)
tree6f2a0cee6a36f7f329d7448041736053abe139b9 /core/java
parentba34886c20250fabac4e2559bba4e3b600ef1dc5 (diff)
parent2d5d1676ffc209481a6e467372aa24f7ceea02c4 (diff)
Merge "Camera: Set metadata vendor id in extension proxy service" into sc-dev am: 2d5d1676ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15224774 Change-Id: I256c30482a4717fd934f64c23478736181f14ea7
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/hardware/camera2/impl/CameraMetadataNative.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/core/java/android/hardware/camera2/impl/CameraMetadataNative.java b/core/java/android/hardware/camera2/impl/CameraMetadataNative.java
index e23bf78d6e76..09fe1020ea59 100644
--- a/core/java/android/hardware/camera2/impl/CameraMetadataNative.java
+++ b/core/java/android/hardware/camera2/impl/CameraMetadataNative.java
@@ -1884,6 +1884,8 @@ public class CameraMetadataNative implements Parcelable {
private static native int nativeGetEntryCount(long ptr);
@FastNative
private static native long nativeGetBufferSize(long ptr);
+ @FastNative
+ private static native void nativeSetVendorId(long ptr, long vendorId);
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
@FastNative
@@ -1929,6 +1931,15 @@ public class CameraMetadataNative implements Parcelable {
}
/**
+ * Set the native metadata vendor id.
+ *
+ * @hide
+ */
+ public void setVendorId(long vendorId) {
+ nativeSetVendorId(mMetadataPtr, vendorId);
+ }
+
+ /**
* @hide
*/
public int getEntryCount() {