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

Commit ac07c999 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11449429 from eb3ad209 to 24Q3-release 

Change-Id: I1b62e4c0b46ac9b24cd4f3895ad6b182c2f8dbd2
parents aa18b787 eb3ad209

include/android/input.h

+8 −0
Original line number Diff line number Diff line
@@ -1490,6 +1490,14 @@ int32_t AMotionEvent_getClassification(const AInputEvent* motion_event) 
 */

const AInputEvent* AMotionEvent_fromJava(JNIEnv* env, jobject motionEvent) __INTRODUCED_IN(31);



/**

 * Creates a java android.view.InputEvent object that is a copy of the specified native

 * {@link AInputEvent}. Returns null on error

 *

 *  Available since API level 35.

 */

jobject AInputEvent_toJava(JNIEnv* env, const AInputEvent* aInputEvent) __INTRODUCED_IN(35);



struct AInputQueue;

/**

 * Input queue

libs/binder/tests/binderLibTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ MATCHER_P(StatusEq, expected, (negation ? "not " : "") + statusToString(expected 
}



static ::testing::AssertionResult IsPageAligned(void *buf) {

    if (((unsigned long)buf & ((unsigned long)PAGE_SIZE - 1)) == 0)

    if (((unsigned long)buf & ((unsigned long)getpagesize() - 1)) == 0)

        return ::testing::AssertionSuccess();

    else

        return ::testing::AssertionFailure() << buf << " is not page aligned";

libs/nativewindow/AHardwareBuffer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -586,7 +586,7 @@ int AHardwareBuffer_createFromHandle(const AHardwareBuffer_Desc* desc, 
    return NO_ERROR;

}



enum AHardwareBufferStatus AHardwareBuffer_allocate2(

enum AHardwareBufferStatus AHardwareBuffer_allocateWithOptions(

        const AHardwareBuffer_Desc* desc, const AHardwareBufferLongOptions* additionalOptions,

        size_t additionalOptionsSize, AHardwareBuffer** outBuffer) {

    (void)additionalOptions;

libs/nativewindow/include/vndk/hardware_buffer.h

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ enum AHardwareBufferStatus : int32_t { 
 *         AHARDWAREBUFFER_STATUS_UNKNOWN_ERROR for any other error

 * any reason. The returned buffer has a reference count of 1.

 */

enum AHardwareBufferStatus AHardwareBuffer_allocate2(

enum AHardwareBufferStatus AHardwareBuffer_allocateWithOptions(

        const AHardwareBuffer_Desc* _Nonnull desc,

        const AHardwareBufferLongOptions* _Nullable additionalOptions, size_t additionalOptionsSize,

        AHardwareBuffer* _Nullable* _Nonnull outBuffer) __INTRODUCED_IN(__ANDROID_API_V__);

libs/nativewindow/libnativewindow.map.txt

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ LIBNATIVEWINDOW { 
  global:

    AHardwareBuffer_acquire;

    AHardwareBuffer_allocate;

    AHardwareBuffer_allocate2; # llndk systemapi

    AHardwareBuffer_allocateWithOptions; # llndk systemapi

    AHardwareBuffer_createFromHandle; # llndk systemapi

    AHardwareBuffer_describe;

    AHardwareBuffer_getId; # introduced=31