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

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

Merge "adb: properly erase destroyed jdwp_trackers." 

am: e02eba8f

Change-Id: Ia87892fecebc64198b70acf089aa7eac3652175e
parents 8294bbf2 e02eba8f

adb/jdwp_service.cpp

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

    remove_socket(s);





    auto pred = [s](const auto& tracker) { return tracker.get() == 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) {

static void jdwp_tracker_ready(asocket* s) {