commit 8f5f812ddf4e4f21631c9b79f494423600e2931b
author Andrew Lee <anwlee@google.com> Sat Oct 25 01:19:26 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Oct 25 01:19:27 2014 +0000
tree be856e5cfe921c69c8336cfbfd6d554181bc9e4a
parent ca469d106e90b4f322c272d9aa715ea8dfa20de1
parent 59a1f81461ccdf5afc5ccb51d0a69c7b42b43d75

Merge "Move CHANGE_PHONE_ACCOUNTS filter to Phone Account Settings." into lmp-mr1-dev

src/com/android/services/telephony/CdmaConferenceController.java

diff --git a/src/com/android/services/telephony/CdmaConferenceController.java b/src/com/android/services/telephony/CdmaConferenceController.java
index d0cf6de..d6d5659 100644
--- a/src/com/android/services/telephony/CdmaConferenceController.java
+++ b/src/com/android/services/telephony/CdmaConferenceController.java
@@ -107,10 +107,10 @@
                 @Override
                 public void run() {
                     connection.forceAsDialing(false);
+                    addInternal(connection);
                     for (CdmaConnection current : connectionsToReset) {
                         current.resetStateForConference();
                     }
-                    addInternal(connection);
                 }
             }, ADD_OUTGOING_CONNECTION_DELAY_MILLIS);
         } else {