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

Commit 06e55977 authored by Hung-ying Tyan's avatar Hung-ying Tyan Committed by Android Git Automerger
Browse files

am 907f6f1d: Merge "Fix SipSessionGroup from throwing... 

am 907f6f1d: Merge "Fix SipSessionGroup from throwing ConcurrentModificationException" into gingerbread

Merge commit '907f6f1d' into gingerbread-plus-aosp

* commit '907f6f1d':
  Fix SipSessionGroup from throwing ConcurrentModificationException
parents 2b87dbc3 907f6f1d

voip/java/com/android/server/sip/SipSessionGroup.java

+7 −1
Original line number Diff line number Diff line
@@ -153,7 +153,13 @@ class SipSessionGroup implements SipListener { 
    }



    synchronized void onConnectivityChanged() {

        for (SipSessionImpl s : mSessionMap.values()) {

        SipSessionImpl[] ss = mSessionMap.values().toArray(

                    new SipSessionImpl[mSessionMap.size()]);

        // Iterate on the copied array instead of directly on mSessionMap to

        // avoid ConcurrentModificationException being thrown when

        // SipSessionImpl removes itself from mSessionMap in onError() in the

        // following loop.

        for (SipSessionImpl s : ss) {

            s.onError(SipErrorCode.DATA_CONNECTION_LOST,

                    "data connection lost");

        }