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

Commit f17838f6 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9376547 from 483d41ed to udc-release 

Change-Id: Ief4b5f69c1e75618664e4493f31e5e601a73bb58
parents 8203cb77 483d41ed

Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -56,7 +56,8 @@ subdirs = [ 


cc_library_headers {

    name: "libandroid_sensor_headers",

    vendor: true,

    vendor_available: true,

    host_supported: true,

    export_include_dirs: ["include_sensor"],

}

libs/binder/ndk/include_cpp/android/binder_to_string.h

+5 −3
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ class ToEmptyString { 
template <typename _T>

std::string ToString(const _T& t) {

    if constexpr (details::ToEmptyString<_T>::value) {

        return "";

        return "<unimplemented>";

    } else if constexpr (std::is_same_v<bool, _T>) {

        return t ? "true" : "false";

    } else if constexpr (std::is_same_v<char16_t, _T>) {
@@ -176,9 +176,11 @@ std::string ToString(const _T& t) { 
        return t;

#ifdef HAS_NDK_INTERFACE

    } else if constexpr (std::is_same_v<::ndk::SpAIBinder, _T>) {

        return (t.get() == nullptr) ? "(null)" : "";

        std::stringstream ss;

        ss << "binder:" << std::hex << t.get();

        return ss.str();

    } else if constexpr (std::is_same_v<::ndk::ScopedFileDescriptor, _T>) {

        return (t.get() == -1) ? "(null)" : "";

        return "fd:" + std::to_string(t.get());

#endif

#ifdef HAS_STRING16

    } else if constexpr (std::is_same_v<String16, _T>) {

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;

    },