Merge "Addressed NDK API feedback" into main (be3b53b4) · Commits · e / os / android_frameworks_native

include/android/OWNERS

+4 −0

Original line number	Diff line number	Diff line
		per-file input.h, keycodes.h = file:platform/frameworks/base:/INPUT_OWNERS

		# Window manager
		per-file surface_control_input_receiver.h = file:platform/frameworks/base:/services/core/java/com/android/server/wm/OWNERS
		per-file input_transfer_token.h = file:platform/frameworks/base:/services/core/java/com/android/server/wm/OWNERS

include/android/input_transfer_token_jni.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -20,8 +20,9 @@
		/**
		* @file input_transfer_token_jni.h
		*/
		#ifndef ANDROID_INPUT_TRANSFER_TOKEN_JNI_H
		#define ANDROID_INPUT_TRANSFER_TOKEN_JNI_H

		#pragma once

		#include <sys/cdefs.h>
		#include <jni.h>

		@@ -60,9 +61,8 @@ jobject _Nonnull AInputTransferToken_toJava(JNIEnv* _Nonnull env,
		*
		* Available since API level 35.
		*/
		void AInputTransferToken_release(AInputTransferToken* _Nonnull aInputTransferToken)
		void AInputTransferToken_release(AInputTransferToken* _Nullable aInputTransferToken)
		__INTRODUCED_IN(__ANDROID_API_V__);

		__END_DECLS
		#endif // ANDROID_INPUT_TRANSFER_TOKEN_JNI_H
		/** @} */

include/android/surface_control_input_receiver.h

+11 −3

Original line number	Diff line number	Diff line
		@@ -13,6 +13,14 @@
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		/**
		* @addtogroup NativeActivity Native Activity
		* @{
		*/
		/**
		* @file surface_control_input_receiver.h
		*/

		#pragma once

		#include <stdint.h>
		@@ -69,7 +77,7 @@ typedef struct AInputReceiver AInputReceiver __INTRODUCED_IN(__ANDROID_API_V__);
		* other input events will be delivered immediately.
		*
		* This is different from AInputReceiver_createUnbatchedInputReceiver in that the input events are
		* received batched. The caller must invoke AInputReceiver_release to cleanv up the resources when
		* received batched. The caller must invoke AInputReceiver_release to clean up the resources when
		* no longer needing to use the input receiver.
		*
		* \param aChoreographer The AChoreographer used for batching. This should match the
		@@ -144,7 +152,7 @@ AInputReceiver_getInputTransferToken(AInputReceiver *_Nonnull aInputReceiver)
		* Available since API level 35.
		*/
		void
		AInputReceiver_release(AInputReceiver *_Nonnull aInputReceiver) __INTRODUCED_IN(__ANDROID_API_V__);
		AInputReceiver_release(AInputReceiver *_Nullable aInputReceiver) __INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Creates a AInputReceiverCallbacks object that is used when registering for an AInputReceiver.
		@@ -164,7 +172,7 @@ AInputReceiverCallbacks* _Nonnull AInputReceiverCallbacks_create(void* _Nullable
		*
		* Available since API level 35
		*/
		void AInputReceiverCallbacks_release(AInputReceiverCallbacks* _Nonnull callbacks)
		void AInputReceiverCallbacks_release(AInputReceiverCallbacks* _Nullable callbacks)
		__INTRODUCED_IN(__ANDROID_API_V__);

		/**