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

Commit fae35716 authored by Dmitrii Merkurev's avatar Dmitrii Merkurev Committed by Automerger Merge Worker
Browse files

Merge "fastboot: Use copy constructor to copy fastboot match callback" am:... 

Merge "fastboot: Use copy constructor to copy fastboot match callback" am: 45380e4a am: 09e817e9

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2438273



Change-Id: I2663eb83fc1c1884e2de3b552bc1158257e0a536
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e74297d5 09e817e9

fastboot/usb_osx.cpp

+1 −2
Original line number Diff line number Diff line
@@ -456,8 +456,7 @@ static int init_usb(ifc_match_func callback, std::unique_ptr<usb_handle>* handle 
        }



        if (h.success) {

            handle->reset(new usb_handle);

            memcpy(handle->get(), &h, sizeof(usb_handle));

            handle->reset(new usb_handle(h));

            ret = 0;

            break;

        }