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

Commit 2dcfdc1b authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "input.h: add missing __INTRODUCED_IN and doc comments." into... 

Merge "input.h: add missing __INTRODUCED_IN and doc comments." into sc-dev-plus-aosp am: 0d8d2552 am: afc2de15 am: c1d8a667

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

Change-Id: I7ab0897588179878ecf45188163a0781e20233e4
parents bc766b08 c1d8a667

include/android/input.h

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

/**