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

Commit 3c109360 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder_ndk: AParcel_markSensitive in llndk" am: 88e60e2e am: 9cf983c6 

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

Change-Id: If0086833a70f4b20870e5a14df2932fd197c9bbc
parents 8d4bb93e 9cf983c6

libs/binder/ndk/include_platform/android/binder_parcel_platform.h

+5 −3
Original line number Original line Diff line number Diff line
@@ -20,9 +20,7 @@ 




__BEGIN_DECLS

__BEGIN_DECLS





#if defined(__ANDROID_APEX__) || defined(__ANDROID_VNDK__)

#if !defined(__ANDROID_APEX__) && !defined(__ANDROID_VNDK__)

#error this is only for platform code

#endif





/**

/**

 * Gets whether or not FDs are allowed by this AParcel

 * Gets whether or not FDs are allowed by this AParcel
@@ -33,6 +31,9 @@ __BEGIN_DECLS 
 */

 */

bool AParcel_getAllowFds(const AParcel*);

bool AParcel_getAllowFds(const AParcel*);





#endif



#if !defined(__ANDROID_APEX__)

/**

/**

 * Data written to the parcel will be zero'd before being deleted or realloced.

 * Data written to the parcel will be zero'd before being deleted or realloced.

 *

 *
@@ -43,5 +44,6 @@ bool AParcel_getAllowFds(const AParcel*); 
 * \param parcel The parcel to clear associated data from.

 * \param parcel The parcel to clear associated data from.

 */

 */

void AParcel_markSensitive(const AParcel* parcel);

void AParcel_markSensitive(const AParcel* parcel);

#endif





__END_DECLS
 
__END_DECLS

libs/binder/ndk/libbinder_ndk.map.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -117,6 +117,7 @@ LIBBINDER_NDK31 { # introduced=31 
    ABinderProcess_setupPolling; # apex

    ABinderProcess_setupPolling; # apex

    AIBinder_getCallingSid; # apex

    AIBinder_getCallingSid; # apex

    AIBinder_setRequestingSid; # apex

    AIBinder_setRequestingSid; # apex

    AParcel_markSensitive; # llndk

    AServiceManager_isDeclared; # apex llndk

    AServiceManager_isDeclared; # apex llndk

    AServiceManager_forEachDeclaredInstance; # apex llndk

    AServiceManager_forEachDeclaredInstance; # apex llndk

    AServiceManager_registerLazyService; # llndk

    AServiceManager_registerLazyService; # llndk
@@ -139,7 +140,6 @@ LIBBINDER_NDK31 { # introduced=31 
LIBBINDER_NDK_PLATFORM {

LIBBINDER_NDK_PLATFORM {

  global:

  global:

    AParcel_getAllowFds;

    AParcel_getAllowFds;

    AParcel_markSensitive;

    extern "C++" {

    extern "C++" {

        AIBinder_fromPlatformBinder*;

        AIBinder_fromPlatformBinder*;

        AIBinder_toPlatformBinder*;

        AIBinder_toPlatformBinder*;