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

Commit 8a0b898e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Add support for SRVCC Conference with greater than 3 participants"

parents c860b10e cabf00a5

src/java/com/android/internal/telephony/gsm/GsmCallTracker.java

+7 −3
Original line number Original line Diff line number Diff line
@@ -436,7 +436,8 @@ public final class GsmCallTracker extends CallTracker { 
        }

        }





        Connection newRinging = null; //or waiting

        Connection newRinging = null; //or waiting

        Connection newUnknown = null;

        ArrayList<Connection> newUnknownConnections =

            new ArrayList<Connection>();

        boolean hasNonHangupStateChanged = false;   // Any change besides

        boolean hasNonHangupStateChanged = false;   // Any change besides

                                                    // a dropped connection

                                                    // a dropped connection

        boolean hasAnyCallDisconnected = false;

        boolean hasAnyCallDisconnected = false;
@@ -529,7 +530,7 @@ public final class GsmCallTracker extends CallTracker { 
                            }

                            }

                        }

                        }





                        newUnknown = mConnections[i];

                        newUnknownConnections.add(mConnections[i]);





                        unknownConnectionAppeared = true;

                        unknownConnectionAppeared = true;

                    }

                    }
@@ -652,7 +653,10 @@ public final class GsmCallTracker extends CallTracker { 
        updatePhoneState();

        updatePhoneState();





        if (unknownConnectionAppeared) {

        if (unknownConnectionAppeared) {

            mPhone.notifyUnknownConnection(newUnknown);

           for (Connection c : newUnknownConnections) {

               log("Notify unknown for " + c);

               mPhone.notifyUnknownConnection(c);

           }

        }

        }





        if (hasNonHangupStateChanged || newRinging != null || hasAnyCallDisconnected) {

        if (hasNonHangupStateChanged || newRinging != null || hasAnyCallDisconnected) {