diff options
| author | Andrei-Valentin Onea <andreionea@google.com> | 2020-04-09 12:25:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-09 12:25:10 +0000 |
| commit | 86e8065132bf6685c12b3ecd802f618723538891 (patch) | |
| tree | 2ab94b62bc44ddadbcf64a50b93f6464374e5115 /core/java | |
| parent | 467185167c24e18de9744a28bcd55a8dd98c47b4 (diff) | |
| parent | e2a545b71f749ed67088aa937a6291755bcb82a3 (diff) | |
Merge "Add method to greylist" into rvc-dev am: 1775d16adb am: 4a9ceaaf48 am: a1857a831f am: e2a545b71f
Change-Id: I812553d72b6c1e02d54d856a7f43686afd344af8
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/hardware/camera2/CameraMetadata.java | 3 |
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 cc24fd2bbf86..cf4df0f0d508 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; |