commit ca469d106e90b4f322c272d9aa715ea8dfa20de1
author Yorke Lee <yorkelee@google.com> Fri Oct 24 20:57:07 2014 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 24 20:57:07 2014 +0000
tree 983f02a17f3fbf1040f5cdfbc52f99fe66acd416
parent b6bf411ab51829c0fe3501942a8fe5f81db6426e
parent d16a7bc2b393d875717b1237c957d5896f08029d

am 7818c7e9: Merge "Add connection before resetting state of sibling connections" into lmp-dev
automerge: d16a7bc

* commit 'd16a7bc2b393d875717b1237c957d5896f08029d':
  Add connection before resetting state of sibling connections

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 {