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

Commit de1d211c authored by Pawan Wagh's avatar Pawan Wagh Committed by Automerger Merge Worker
Browse files

Merge "Move parcelable aidl files into package" am: 1205a2e0 am: 8742d9b8 

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



Change-Id: I80d34bcec32253b99ce7a471d83916b6d6c6336a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 34b1126c 8742d9b8

libs/binder/rust/tests/parcel_fuzzer/read_utils.rs

+3 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 


use binder::binder_impl::BorrowedParcel;

use binder::{ParcelFileDescriptor, Parcelable, SpIBinder};

use binderReadParcelIface::aidl::EmptyParcelable::EmptyParcelable;

use binderReadParcelIface::aidl::GenericDataParcelable::GenericDataParcelable;

use binderReadParcelIface::aidl::SingleDataParcelable::SingleDataParcelable;

use binderReadParcelIface::aidl::parcelables::EmptyParcelable::EmptyParcelable;

use binderReadParcelIface::aidl::parcelables::GenericDataParcelable::GenericDataParcelable;

use binderReadParcelIface::aidl::parcelables::SingleDataParcelable::SingleDataParcelable;



macro_rules! read_parcel_interface {

    ($data_type:ty) => {

libs/binder/tests/parcel_fuzzer/Android.bp

+5 −4
Original line number Diff line number Diff line
@@ -12,13 +12,14 @@ aidl_interface { 
    host_supported: true,

    unstable: true,

    srcs: [

        "EmptyParcelable.aidl",

        "SingleDataParcelable.aidl",

        "GenericDataParcelable.aidl",

        "parcelables/EmptyParcelable.aidl",

        "parcelables/SingleDataParcelable.aidl",

        "parcelables/GenericDataParcelable.aidl",

    ],

    backend: {

        java: {

            enabled: false,

            enabled: true,

            platform_apis: true,

        },

        rust: {

            enabled: true,

libs/binder/tests/parcel_fuzzer/binder.cpp

+6 −6
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 
#define FUZZ_LOG_TAG "binder"



#include "binder.h"

#include "EmptyParcelable.h"

#include "GenericDataParcelable.h"

#include "SingleDataParcelable.h"

#include "parcelables/EmptyParcelable.h"

#include "parcelables/GenericDataParcelable.h"

#include "parcelables/SingleDataParcelable.h"

#include "util.h"



#include <android-base/hex.h>
@@ -359,19 +359,19 @@ std::vector<ParcelRead<::android::Parcel>> BINDER_PARCEL_READ_FUNCTIONS { 
    },

    [] (const ::android::Parcel& p, FuzzedDataProvider& /*provider*/) {

        FUZZ_LOG() << "about to call readFromParcel() with status for EmptyParcelable";

        EmptyParcelable emptyParcelable{};

        parcelables::EmptyParcelable emptyParcelable{};

        status_t status = emptyParcelable.readFromParcel(&p);

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

    },

    [] (const ::android::Parcel& p , FuzzedDataProvider& /*provider*/) {

        FUZZ_LOG() << "about to call readFromParcel() with status for SingleDataParcelable";

        SingleDataParcelable singleDataParcelable;

        parcelables::SingleDataParcelable singleDataParcelable;

        status_t status = singleDataParcelable.readFromParcel(&p);

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

    },

    [] (const ::android::Parcel& p, FuzzedDataProvider& /*provider*/) {

        FUZZ_LOG() << "about to call readFromParcel() with status for GenericDataParcelable";

        GenericDataParcelable genericDataParcelable;

        parcelables::GenericDataParcelable genericDataParcelable;

        status_t status = genericDataParcelable.readFromParcel(&p);

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

    },

libs/binder/tests/parcel_fuzzer/binder_ndk.cpp

+6 −6
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 
#define FUZZ_LOG_TAG "binder_ndk"



#include "binder_ndk.h"

#include "aidl/EmptyParcelable.h"

#include "aidl/GenericDataParcelable.h"

#include "aidl/SingleDataParcelable.h"

#include "aidl/parcelables/EmptyParcelable.h"

#include "aidl/parcelables/GenericDataParcelable.h"

#include "aidl/parcelables/SingleDataParcelable.h"



#include <android/binder_parcel_utils.h>

#include <android/binder_parcelable_utils.h>
@@ -183,19 +183,19 @@ std::vector<ParcelRead<NdkParcelAdapter>> BINDER_NDK_PARCEL_READ_FUNCTIONS{ 


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

            FUZZ_LOG() << "about to read parcel using readFromParcel for EmptyParcelable";

            aidl::EmptyParcelable emptyParcelable;

            aidl::parcelables::EmptyParcelable emptyParcelable;

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

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

        },

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

            FUZZ_LOG() << "about to read parcel using readFromParcel for SingleDataParcelable";

            aidl::SingleDataParcelable singleDataParcelable;

            aidl::parcelables::SingleDataParcelable singleDataParcelable;

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

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

        },

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

            FUZZ_LOG() << "about to read parcel using readFromParcel for GenericDataParcelable";

            aidl::GenericDataParcelable genericDataParcelable;

            aidl::parcelables::GenericDataParcelable genericDataParcelable;

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

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

        },

libs/binder/tests/parcel_fuzzer/EmptyParcelable.aidl→libs/binder/tests/parcel_fuzzer/parcelables/EmptyParcelable.aidl

+2 −2
Original line number Diff line number Diff line
@@ -13,6 +13,6 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package parcelables;

parcelable EmptyParcelable {

}
 
 No newline at end of file