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

Commit 5a9f454e authored by Hsin-chen Chuang's avatar Hsin-chen Chuang Committed by Automerger Merge Worker
Browse files

Merge "floss: topshim: Fix pointers that point to dropped objects" am:... 

Merge "floss: topshim: Fix pointers that point to dropped objects" am: 5c67b9ab am: 81854574 am: 5a8a114b

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2234933



Change-Id: I3fa430efba96c84f60b7118574fbb5e6fbc04b95
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 935214ef 5a8a114b

system/gd/rust/topshim/src/profiles/socket.rs

+2 −2
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ impl BtSocket { 
        };



        let uuid_ptr = match uuid {

            Some(u) => &u as *const Uuid,

            Some(ref u) => u as *const Uuid,

            None => std::ptr::null(),

        };
@@ -199,7 +199,7 @@ impl BtSocket { 
        };



        let uuid_ptr = match uuid {

            Some(u) => &u as *const Uuid,

            Some(ref u) => u as *const Uuid,

            None => std::ptr::null(),

        };