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

Commit 726d5169 authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Merge changes I3ef77f56,Ia774f27a into udc-dev-plus-aosp am: d82a3c78 am: 1ad91b34 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/24722416



Change-Id: I2a657297343f32c4900bb8e37e0c9a9b5de3cf83
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 31a0f284 1ad91b34

media/ndk/include/media/NdkImageReader.h

+5 −0
Original line number Diff line number Diff line
@@ -534,6 +534,11 @@ media_status_t AImageReader_setBufferRemovedListener( 
 * Get the native_handle_t corresponding to the ANativeWindow owned by the

 * AImageReader provided.

 *

 * This is deprecated in API level 35 and will return AMEDIA_ERROR_UNKNOWN.

 * The native_handle_t is no longer used with AIDL interfaces and

 * ANativeWindow is used directly instead.

 * Use AImageRead_getWindow to get the ANativeWindow and use that object.

 *

 * @param reader The image reader of interest.

 * @param handle The output native_handle_t. This native handle is owned by

 *               this image reader.