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

Commit 60749f8d authored by Matthew Maurer's avatar Matthew Maurer Committed by Automerger Merge Worker
Browse files

Merge "binder: rust: Fix dropped service memleak" am: 70888dc4

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

Change-Id: Ia448cf8551f370a11a270093dd1c89a595c2b3c4
parents 83b58c7e 70888dc4
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ use std::convert::TryFrom;
use std::ffi::{c_void, CString};
use std::mem::ManuallyDrop;
use std::ops::Deref;
use std::ptr;

/// Rust wrapper around Binder remotable objects.
///
@@ -273,7 +272,7 @@ impl<T: Remotable> InterfaceClassMethods for Binder<T> {
    /// Must be called with a valid pointer to a `T` object. After this call,
    /// the pointer will be invalid and should not be dereferenced.
    unsafe extern "C" fn on_destroy(object: *mut c_void) {
        ptr::drop_in_place(object as *mut T)
        Box::from_raw(object as *mut T);
    }

    /// Called whenever a new, local `AIBinder` object is needed of a specific