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

Commit f35a32c5 authored by Christian Wailes's avatar Christian Wailes Committed by Automerger Merge Worker
Browse files

Merge "Fix warnings in preparation for Rust 1.54.0" am: 506048be am:... 

Merge "Fix warnings in preparation for Rust 1.54.0" am: 506048be am: 676e3f4d am: 4fe25068 am: 6b10a318

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

Change-Id: I07f498fbf7b7bfe8c742447422264ed392f4eb9e
parents 9e0d2bfe 6b10a318

libs/binder/rust/tests/ndk_rust_interop.rs

+1 −1
Original line number Original line Diff line number Diff line
@@ -90,7 +90,7 @@ impl IBinderRustNdkInteropTest for Service { 
pub unsafe extern "C" fn rust_start_service(service_name: *const c_char) -> c_int {

pub unsafe extern "C" fn rust_start_service(service_name: *const c_char) -> c_int {

    let service_name = CStr::from_ptr(service_name).to_str().unwrap();

    let service_name = CStr::from_ptr(service_name).to_str().unwrap();

    let service = BnBinderRustNdkInteropTest::new_binder(Service, BinderFeatures::default());

    let service = BnBinderRustNdkInteropTest::new_binder(Service, BinderFeatures::default());

    match binder::add_service(&service_name, service.as_binder()) {

    match binder::add_service(service_name, service.as_binder()) {

        Ok(_) => StatusCode::OK as c_int,

        Ok(_) => StatusCode::OK as c_int,

        Err(e) => e as c_int,

        Err(e) => e as c_int,

    }

    }