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

Commit 136f2e2d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libbinder_ndk: use API level 33 for new APIs" am: 4f94e0a6 am: 8da01f9d am: f9a1f90f 

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

Change-Id: I7155cff0adc8546a475449fb7efcee6d17c22b95
parents da8e86c4 f9a1f90f

libs/binder/ndk/include_ndk/android/binder_ibinder.h

+2 −2
Original line number Diff line number Diff line
@@ -227,11 +227,11 @@ void AIBinder_Class_setOnDump(AIBinder_Class* clazz, AIBinder_onDump onDump) __I 
 * must have a separate way of determining the binder you are talking to is the right type. Must

 * be called before any instance of the class is created.

 *

 * Available since API level 32.

 * Available since API level 33.

 *

 * \param clazz class to disable interface header on.

 */

void AIBinder_Class_disableInterfaceTokenHeader(AIBinder_Class* clazz) __INTRODUCED_IN(32);

void AIBinder_Class_disableInterfaceTokenHeader(AIBinder_Class* clazz) __INTRODUCED_IN(33);



/**

 * Creates a new binder object of the appropriate class.

libs/binder/ndk/libbinder_ndk.map.txt

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ LIBBINDER_NDK31 { # introduced=31 
    AParcel_reset;

};



LIBBINDER_NDK32 { # introduced=32

LIBBINDER_NDK33 { # introduced=33

  global:

    AIBinder_Class_disableInterfaceTokenHeader;

};