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

Commit 6c54561d authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

Merge "adb: properly erase destroyed jdwp_trackers." am: e02eba8f 

am: b0e8bbfc

Change-Id: I4c6b3d1acb3b75a2fce6d850b256b15c823c3de1
parents 17754dc0 b0e8bbfc

adb/jdwp_service.cpp

+2 −1
Original line number Diff line number Diff line
@@ -571,7 +571,8 @@ static void jdwp_tracker_close(asocket* s) { 
    remove_socket(s);



    auto pred = [s](const auto& tracker) { return tracker.get() == s; };

    std::remove_if(_jdwp_trackers.begin(), _jdwp_trackers.end(), pred);

    _jdwp_trackers.erase(std::remove_if(_jdwp_trackers.begin(), _jdwp_trackers.end(), pred),

                         _jdwp_trackers.end());

}



static void jdwp_tracker_ready(asocket* s) {