tree f9ed80c97a6b2476e247a69f31d5b718cdad6d37
parent 9ac7ff1b2d8b27fbc1cbd251477d67ae46ee987e
author junyulai <junyulai@google.com> 1557728340 +0800
committer junyulai <junyulai@google.com> 1557730121 +0800

Fix concurrent modification exception in KeepaliveTracker

In aosp/951200, the clean up function delete the item in the
hash map that holds the record while iterating it, where the
list used to iterate the records is backed by the hash map,
so changes to the map are reflected in the list and caused
the concurrent modification exception.

Bug: 132341736
Test: 1. atest com.android.server.ConnectivityServiceTest \
         #testNattSocketKeepalives --generate-new-metrics 300
      2. atest FrameworksNetTests --generate-new-metrics 10

Change-Id: I0481a469ee23231e5f0ab738a06b5e09f6cdb680