summaryrefslogtreecommitdiff
path: root/include/android
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2021-09-14 21:43:17 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-09-14 21:43:17 +0000
commit2dcfdc1b5d30dcbb362ce18c6e7d862125e2cb25 (patch)
tree01e9f7160b31500ddf41aab038e78e09a7fdb784 /include/android
parentbc766b0801283fd8d01923add91b66ace1c6a6be (diff)
parentc1d8a6671e7f2fcd3794912ad81691fda915933e (diff)
Merge "input.h: add missing __INTRODUCED_IN and doc comments." into sc-dev-plus-aosp am: 0d8d2552a8 am: afc2de1587 am: c1d8a6671e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15828516 Change-Id: I7ab0897588179878ecf45188163a0781e20233e4
Diffstat (limited to 'include/android')
-rw-r--r--include/android/input.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/include/android/input.h b/include/android/input.h
index f03facb929..6d2c1b3015 100644
--- a/include/android/input.h
+++ b/include/android/input.h
@@ -950,9 +950,10 @@ int32_t AInputEvent_getSource(const AInputEvent* event);
* and {@link AMotionEvent_fromJava()}.
* After returning, the specified AInputEvent* object becomes invalid and should no longer be used.
* The underlying Java object remains valid and does not change its state.
+ *
+ * Available since API level 31.
*/
-
-void AInputEvent_release(const AInputEvent* event);
+void AInputEvent_release(const AInputEvent* event) __INTRODUCED_IN(31);
/*** Accessors for key events only. ***/
@@ -1004,8 +1005,10 @@ int64_t AKeyEvent_getEventTime(const AInputEvent* key_event);
* Creates a native AInputEvent* object that is a copy of the specified Java android.view.KeyEvent.
* The result may be used with generic and KeyEvent-specific AInputEvent_* functions. The object
* returned by this function must be disposed using {@link AInputEvent_release()}.
+ *
+ * Available since API level 31.
*/
-const AInputEvent* AKeyEvent_fromJava(JNIEnv* env, jobject keyEvent);
+const AInputEvent* AKeyEvent_fromJava(JNIEnv* env, jobject keyEvent) __INTRODUCED_IN(31);
/*** Accessors for motion events only. ***/
@@ -1327,8 +1330,10 @@ float AMotionEvent_getHistoricalAxisValue(const AInputEvent* motion_event,
* android.view.MotionEvent. The result may be used with generic and MotionEvent-specific
* AInputEvent_* functions. The object returned by this function must be disposed using
* {@link AInputEvent_release()}.
+ *
+ * Available since API level 31.
*/
-const AInputEvent* AMotionEvent_fromJava(JNIEnv* env, jobject motionEvent);
+const AInputEvent* AMotionEvent_fromJava(JNIEnv* env, jobject motionEvent) __INTRODUCED_IN(31);
struct AInputQueue;
/**