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

Commit da6a9b12 authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge changes from topic "ndk-rust-nullables" am: fe441bf6 am: 05674527 am: f92e747e 

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

Change-Id: I3625a6915c543284713205b3a32af5049bfa0c9f
parents 72068c03 f92e747e

libs/binder/rust/src/parcel/file_descriptor.rs

+0 −4
Original line number Original line Diff line number Diff line
@@ -94,8 +94,6 @@ impl SerializeOption for ParcelFileDescriptor { 
    }

    }

}

}





impl SerializeArray for Option<ParcelFileDescriptor> {}



impl DeserializeOption for ParcelFileDescriptor {

impl DeserializeOption for ParcelFileDescriptor {

    fn deserialize_option(parcel: &Parcel) -> Result<Option<Self>> {

    fn deserialize_option(parcel: &Parcel) -> Result<Option<Self>> {

        let mut fd = -1i32;

        let mut fd = -1i32;
@@ -126,8 +124,6 @@ impl DeserializeOption for ParcelFileDescriptor { 
    }

    }

}

}





impl DeserializeArray for Option<ParcelFileDescriptor> {}



impl Deserialize for ParcelFileDescriptor {

impl Deserialize for ParcelFileDescriptor {

    fn deserialize(parcel: &Parcel) -> Result<Self> {

    fn deserialize(parcel: &Parcel) -> Result<Self> {

        Deserialize::deserialize(parcel)

        Deserialize::deserialize(parcel)

libs/binder/rust/src/parcel/parcelable.rs

+3 −4
Original line number Original line Diff line number Diff line
@@ -383,6 +383,9 @@ macro_rules! impl_parcelable { 
    };

    };

}

}





impl<T: DeserializeOption> DeserializeArray for Option<T> {}

impl<T: SerializeOption> SerializeArray for Option<T> {}



parcelable_primitives! {

parcelable_primitives! {

    impl Serialize for bool = sys::AParcel_writeBool;

    impl Serialize for bool = sys::AParcel_writeBool;

    impl Deserialize for bool = sys::AParcel_readBool;

    impl Deserialize for bool = sys::AParcel_readBool;
@@ -537,8 +540,6 @@ impl SerializeOption for str { 
    }

    }

}

}





impl SerializeArray for Option<&str> {}



impl Serialize for str {

impl Serialize for str {

    fn serialize(&self, parcel: &mut Parcel) -> Result<()> {

    fn serialize(&self, parcel: &mut Parcel) -> Result<()> {

        Some(self).serialize(parcel)

        Some(self).serialize(parcel)
@@ -561,8 +562,6 @@ impl SerializeOption for String { 
    }

    }

}

}





impl SerializeArray for Option<String> {}



impl Deserialize for Option<String> {

impl Deserialize for Option<String> {

    fn deserialize(parcel: &Parcel) -> Result<Self> {

    fn deserialize(parcel: &Parcel) -> Result<Self> {

        let mut vec: Option<Vec<u8>> = None;

        let mut vec: Option<Vec<u8>> = None;

libs/binder/rust/src/proxy.rs

+0 −3
Original line number Original line Diff line number Diff line
@@ -429,8 +429,6 @@ impl SerializeOption for SpIBinder { 
}

}





impl SerializeArray for SpIBinder {}

impl SerializeArray for SpIBinder {}

impl SerializeArray for Option<&SpIBinder> {}

impl SerializeArray for Option<SpIBinder> {}





impl Deserialize for SpIBinder {

impl Deserialize for SpIBinder {

    fn deserialize(parcel: &Parcel) -> Result<SpIBinder> {

    fn deserialize(parcel: &Parcel) -> Result<SpIBinder> {
@@ -448,7 +446,6 @@ impl DeserializeOption for SpIBinder { 
}

}





impl DeserializeArray for SpIBinder {}

impl DeserializeArray for SpIBinder {}

impl DeserializeArray for Option<SpIBinder> {}





/// A weak reference to a Binder remote object.

/// A weak reference to a Binder remote object.

///

///