Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add method to greylist" into rvc-dev am: 1775d16adb am: 4a9ceaaf48 am: a1857a831f

Browse Source 
Change-Id: I73768925325ac5a9171ebdc3d8bedb0fe0bd3030
This commit is contained in:
Andrei-Valentin Onea
2020-04-09 12:14:41 +00:00
committed by Automerger Merge Worker
parent 94f0093334 a1857a831f
commit e2a545b71f
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/hardware/camera2/CameraMetadata.java
View File

@@ -17,6 +17,7 @@
package android.hardware.camera2; package android.hardware.camera2;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.compat.annotation.UnsupportedAppUsage;
import android.hardware.camera2.impl.CameraMetadataNative; import android.hardware.camera2.impl.CameraMetadataNative;
import android.hardware.camera2.impl.PublicKey; import android.hardware.camera2.impl.PublicKey;
import android.hardware.camera2.impl.SyntheticKey; import android.hardware.camera2.impl.SyntheticKey;
@@ -100,6 +101,8 @@ public abstract class CameraMetadata<TKey> {
* *
* @hide * @hide
*/ */
@UnsupportedAppUsage(publicAlternatives = "This method is exposed for native "
+ "{@code ACameraMetadata_fromCameraMetadata} in {@code libcamera2ndk}.")
public long getNativeMetadataPtr() { public long getNativeMetadataPtr() {
if (mNativeInstance == null) { if (mNativeInstance == null) {
return 0; return 0;