summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andrei-Valentin Onea <andreionea@google.com> 2020-04-09 11:42:10 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-04-09 11:42:10 +0000
commit4a9ceaaf486971eeaf1024880e70a61e67d77efe (patch)
tree183c093bc8bc56447ce51dd6209ece3ed8da0262
parentda6d0054aa555ba626bf19dfdd6ae6318975fc8a (diff)
parent1775d16adb355191b4963ce57d45296a848ba82b (diff)
Merge "Add method to greylist" into rvc-dev am: 1775d16adb
Change-Id: I117f4fb0638a748bd3c45f3a2e9ea00307b08a9d
-rw-r--r--core/java/android/hardware/camera2/CameraMetadata.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java
index 91dae66d08ae..aa75f6042db8 100644
--- a/core/java/android/hardware/camera2/CameraMetadata.java
+++ b/core/java/android/hardware/camera2/CameraMetadata.java
@@ -17,6 +17,7 @@
package android.hardware.camera2;
import android.annotation.NonNull;
+import android.compat.annotation.UnsupportedAppUsage;
import android.hardware.camera2.impl.CameraMetadataNative;
import android.hardware.camera2.impl.PublicKey;
import android.hardware.camera2.impl.SyntheticKey;
@@ -100,6 +101,8 @@ public abstract class CameraMetadata<TKey> {
*
* @hide
*/
+ @UnsupportedAppUsage(publicAlternatives = "This method is exposed for native "
+ + "{@code ACameraMetadata_fromCameraMetadata} in {@code libcamera2ndk}.")
public long getNativeMetadataPtr() {
if (mNativeInstance == null) {
return 0;