Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1857a83 authored by Andrei-Valentin Onea's avatar Andrei-Valentin Onea Committed by Automerger Merge Worker
Browse files

Merge "Add method to greylist" into rvc-dev am: 1775d16a am: 4a9ceaaf 

Change-Id: I4126c395c7fd9d479901dd9c6e548fc129f01a60
parents 7ac3f1ca 4a9ceaaf

core/java/android/hardware/camera2/CameraMetadata.java

+3 −0
Original line number Diff line number Diff line
@@ -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;