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

Commit 6eb755fb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ifef817a0,Ia013f48a into stage-aosp-master 

* changes:
  Fix doxygen syntax.
  Restore __ANDROID_API__ guards for core <android/*> APIs
parents 77520887 52e36582

include/android/choreographer.h

+4 −0
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ typedef struct AChoreographer AChoreographer; 
 */

typedef void (*AChoreographer_frameCallback)(long frameTimeNanos, void* data);



#if __ANDROID_API__ >= 24



/**

 * Get the AChoreographer instance for the current thread. This must be called

 * on an ALooper thread.
@@ -65,6 +67,8 @@ void AChoreographer_postFrameCallbackDelayed(AChoreographer* choreographer, 
                AChoreographer_frameCallback callback, void* data,

                long delayMillis) __INTRODUCED_IN(24);



#endif /* __ANDROID_API__ >= 24 */



__END_DECLS



#endif // ANDROID_CHOREOGRAPHER_H

include/android/configuration.h

+4 −0
Original line number Diff line number Diff line
@@ -675,6 +675,7 @@ int32_t AConfiguration_getUiModeNight(AConfiguration* config); 
 */

void AConfiguration_setUiModeNight(AConfiguration* config, int32_t uiModeNight);



#if __ANDROID_API__ >= 13

/**

 * Return the current configuration screen width in dp units, or

 * ACONFIGURATION_SCREEN_WIDTH_DP_ANY if not set.
@@ -707,7 +708,9 @@ int32_t AConfiguration_getSmallestScreenWidthDp(AConfiguration* config) __INTROD 
 * Set the configuration's smallest screen width in dp units.

 */

void AConfiguration_setSmallestScreenWidthDp(AConfiguration* config, int32_t value) __INTRODUCED_IN(13);

#endif /* __ANDROID_API__ >= 13 */



#if __ANDROID_API__ >= 17

/**

 * Return the configuration's layout direction, or

 * ACONFIGURATION_LAYOUTDIR_ANY if not set.
@@ -718,6 +721,7 @@ int32_t AConfiguration_getLayoutDirection(AConfiguration* config) __INTRODUCED_I 
 * Set the configuration's layout direction.

 */

void AConfiguration_setLayoutDirection(AConfiguration* config, int32_t value) __INTRODUCED_IN(17);

#endif /* __ANDROID_API__ >= 17 */



/**

 * Perform a diff between two configurations.  Returns a bit mask of

include/android/input.h

+8 −0
Original line number Diff line number Diff line
@@ -986,8 +986,10 @@ int32_t AMotionEvent_getFlags(const AInputEvent* motion_event); 
 */

int32_t AMotionEvent_getMetaState(const AInputEvent* motion_event);



#if __ANDROID_API__ >= 14

/** Get the button state of all buttons that are pressed. */

int32_t AMotionEvent_getButtonState(const AInputEvent* motion_event) __INTRODUCED_IN(14);

#endif



/**

 * Get a bitfield indicating which edges, if any, were touched by this motion event.
@@ -1052,12 +1054,14 @@ size_t AMotionEvent_getPointerCount(const AInputEvent* motion_event); 
 */

int32_t AMotionEvent_getPointerId(const AInputEvent* motion_event, size_t pointer_index);



#if __ANDROID_API__ >= 14

/**

 * Get the tool type of a pointer for the given pointer index.

 * The tool type indicates the type of tool used to make contact such as a

 * finger or stylus, if known.

 */

int32_t AMotionEvent_getToolType(const AInputEvent* motion_event, size_t pointer_index) __INTRODUCED_IN(14);

#endif



/**

 * Get the original raw X coordinate of this event.
@@ -1147,9 +1151,11 @@ float AMotionEvent_getToolMinor(const AInputEvent* motion_event, size_t pointer_ 
 */

float AMotionEvent_getOrientation(const AInputEvent* motion_event, size_t pointer_index);



#if __ANDROID_API__ >= 13

/** Get the value of the request axis for the given pointer index. */

float AMotionEvent_getAxisValue(const AInputEvent* motion_event,

        int32_t axis, size_t pointer_index) __INTRODUCED_IN(13);

#endif



/**

 * Get the number of historical points in this event.  These are movements that
@@ -1280,12 +1286,14 @@ float AMotionEvent_getHistoricalToolMinor(const AInputEvent* motion_event, size_ 
float AMotionEvent_getHistoricalOrientation(const AInputEvent* motion_event, size_t pointer_index,

        size_t history_index);



#if __ANDROID_API__ >= 13

/**

 * Get the historical value of the request axis for the given pointer index

 * that occurred between this event and the previous motion event.

 */

float AMotionEvent_getHistoricalAxisValue(const AInputEvent* motion_event,

        int32_t axis, size_t pointer_index, size_t history_index) __INTRODUCED_IN(13);

#endif





struct AInputQueue;

include/android/multinetwork.h

+4 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ typedef uint64_t net_handle_t; 
 * on failure with an appropriate errno value set.

 */



#if __ANDROID_API__ >= 23



/**

 * Set the network to be used by the given socket file descriptor.

 *
@@ -106,6 +108,8 @@ int android_getaddrinfofornetwork(net_handle_t network, 
        const char *node, const char *service,

        const struct addrinfo *hints, struct addrinfo **res) __INTRODUCED_IN(23);



#endif /* __ANDROID_API__ >= 23 */



__END_DECLS



#endif  // ANDROID_MULTINETWORK_H

include/android/native_window_jni.h

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ extern "C" { 
 */

ANativeWindow* ANativeWindow_fromSurface(JNIEnv* env, jobject surface);



#if __ANDROID_API__ >= 26

/**

 * Return a Java Surface object derived from the ANativeWindow, for interacting

 * with it through Java code. The returned Java object acquires a reference on
@@ -52,6 +53,7 @@ ANativeWindow* ANativeWindow_fromSurface(JNIEnv* env, jobject surface); 
 * collected.

 */

jobject ANativeWindow_toSurface(JNIEnv* env, ANativeWindow* window) __INTRODUCED_IN(26);

#endif



#ifdef __cplusplus

};