commit 61760594ec53aea7fa8b56f8bfffe9a798a128ff
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Feb 14 17:17:03 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 14 17:17:03 2018 +0000
tree 0921d6ea3556ee06df79dd2f25c5b40990a7fe46
parent 904f97135eccf189f8411c7bc114c11288db9b01
parent c8fd511bf992e68718ebe72f8efd91f90b3e5150

Merge "Simplify some tests in AssistedDialingMediatorImplTest"

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

diff --git a/src/com/android/services/telephony/ImsConference.java b/src/com/android/services/telephony/ImsConference.java
index 72184c4..c62a7f1 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -273,10 +273,10 @@
         long connectTime = conferenceHost.getOriginalConnection().getConnectTime();
         long connectElapsedTime = conferenceHost.getOriginalConnection().getConnectTimeReal();
         setConnectionTime(connectTime);
-        setConnectionElapsedTime(connectElapsedTime);
+        setConnectionStartElapsedRealTime(connectElapsedTime);
         // Set the connectTime in the connection as well.
         conferenceHost.setConnectTimeMillis(connectTime);
-        conferenceHost.setConnectElapsedTimeMillis(connectElapsedTime);
+        conferenceHost.setConnectionStartElapsedRealTime(connectElapsedTime);
 
         mTelephonyConnectionService = telephonyConnectionService;
         setConferenceHost(conferenceHost);