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

Commit 5a4119f2 authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Merge changes Iad6dba81,Ic15a8a50,I7d605ac8 am: 44fc01a1 am: db02163f am:... 

Merge changes Iad6dba81,Ic15a8a50,I7d605ac8 am: 44fc01a1 am: db02163f am: b2258657 am: 70b7c549 am: 09a739e8

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



Change-Id: Ia0f9c2fbe9da10ae68b96b5b3c73af9f9e767de4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 79b21491 09a739e8

libs/binder/tests/parcel_fuzzer/binder.cpp

+2 −1
Original line number Diff line number Diff line
@@ -374,7 +374,8 @@ std::vector<ParcelRead<::android::Parcel>> BINDER_PARCEL_READ_FUNCTIONS { 
        parcelables::GenericDataParcelable genericDataParcelable;

        status_t status = genericDataParcelable.readFromParcel(&p);

        FUZZ_LOG() << " status: " << status;

        FUZZ_LOG() << " toString() result: " << genericDataParcelable.toString();

        std::string toString = genericDataParcelable.toString();

        FUZZ_LOG() << " toString() result: " << toString;

    },

};

// clang-format on

libs/binder/tests/parcel_fuzzer/binder_ndk.cpp

+2 −0
Original line number Diff line number Diff line
@@ -198,6 +198,8 @@ std::vector<ParcelRead<NdkParcelAdapter>> BINDER_NDK_PARCEL_READ_FUNCTIONS{ 
            aidl::parcelables::GenericDataParcelable genericDataParcelable;

            binder_status_t status = genericDataParcelable.readFromParcel(p.aParcel());

            FUZZ_LOG() << "status: " << status;

            std::string toString = genericDataParcelable.toString();

            FUZZ_LOG() << "toString() result: " << toString;

        },

        [](const NdkParcelAdapter& p, FuzzedDataProvider& provider) {

            FUZZ_LOG() << "about to marshal AParcel";

libs/binder/tests/parcel_fuzzer/parcelables/GenericDataParcelable.aidl

+10 −0
Original line number Diff line number Diff line
@@ -16,6 +16,14 @@ 
package parcelables;



parcelable GenericDataParcelable {

    enum JustSomeEnum {

        SOME_ENUMERATOR,

        ANOTHER_ENUMERATOR,

        MAYBE_ONE_MORE_ENUMERATOR,

    }



    const int COOL_CONSTANT = 0x1234;



    int data;

    float majorVersion;

    float minorVersion;
@@ -25,4 +33,6 @@ parcelable GenericDataParcelable { 
    String greatString;

    @utf8InCpp

    String greaterString;

    @nullable String nullableString;

    JustSomeEnum gretEnum = JustSomeEnum.ANOTHER_ENUMERATOR;

}