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

Commit 14c1c5fa authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update needed for Rust v1.73.0" into main am: 06e8db08 

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



Change-Id: Ib5df921105e51b258b5a435675e351fc9e571e73
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 81796b62 06e8db08

libs/binder/rust/tests/ndk_rust_interop.rs

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ pub unsafe extern "C" fn rust_call_ndk(service_name: *const c_char) -> c_int { 
    let wrong_service: Result<binder::Strong<dyn IBinderRustNdkInteropTestOther>, StatusCode> =

        binder::get_interface(service_name);

    match wrong_service {

        Err(e) if e == StatusCode::BAD_TYPE => {}

        Err(StatusCode::BAD_TYPE) => {}

        Err(e) => {

            eprintln!("Trying to use a service via the wrong interface errored with unexpected error {:?}", e);

            return e as c_int;