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

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

Merge "AParcel_markSensitive in APEX" am: 51396d2f 

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

Change-Id: Ib2317794e36ff808681451bae669faf396620ef5
parents 1152005d 51396d2f

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -33,7 +33,6 @@ bool AParcel_getAllowFds(const AParcel*); 




#endif

#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.

 *

 *
@@ -44,6 +43,5 @@ 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,7 +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

    AParcel_markSensitive; # systemapi llndk

    AServiceManager_forEachDeclaredInstance; # apex llndk

    AServiceManager_forEachDeclaredInstance; # apex llndk

    AServiceManager_forceLazyServicesPersist; # llndk

    AServiceManager_forceLazyServicesPersist; # llndk

    AServiceManager_isDeclared; # apex llndk

    AServiceManager_isDeclared; # apex llndk

libs/binder/ndk/tests/Android.bp

+12 −1
Original line number Original line Diff line number Diff line
@@ -73,7 +73,10 @@ cc_test { 
        "IBinderNdkUnitTest-cpp",

        "IBinderNdkUnitTest-cpp",

        "IBinderNdkUnitTest-ndk_platform",

        "IBinderNdkUnitTest-ndk_platform",

    ],

    ],

    test_suites: ["general-tests", "vts"],

    test_suites: [

        "general-tests",

        "vts",

    ],

    require_root: true,

    require_root: true,

}

}
@@ -115,4 +118,12 @@ aidl_interface { 
        "IBinderNdkUnitTest.aidl",

        "IBinderNdkUnitTest.aidl",

        "IEmpty.aidl",

        "IEmpty.aidl",

    ],

    ],

    backend: {

        java: {

            enabled: false,

        },

        ndk: {

            apps_enabled: false,

        },

    },

}
 
}

libs/binder/ndk/tests/IBinderNdkUnitTest.aidl

+1 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ 




import IEmpty;

import IEmpty;





@SensitiveData

interface IBinderNdkUnitTest {

interface IBinderNdkUnitTest {

    int repeatInt(int a);

    int repeatInt(int a);