Merge "Rename Conference#setConnectionElapsedTime to clarity." am: d1134525fc am: a0b41a82ce

am: 4c09901931 Change-Id: I493ade2029398983a76fd41fcf9f080ee2f06b95
2018-02-14 01:24:44 +00:00
parent 6a9fb94333 4c09901931
commit 0f9643190e
4 changed files with 22 additions and 18 deletions
--- a/telecomm/java/android/telecom/ConnectionService.java
+++ b/telecomm/java/android/telecom/ConnectionService.java
@@ -21,7 +21,6 @@ import android.app.Service;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
@@ -2007,7 +2006,7 @@ public abstract class ConnectionService extends Service {
                            null : conference.getVideoProvider().getInterface(),
                    conference.getVideoState(),
                    conference.getConnectTimeMillis(),
-                    conference.getConnectElapsedTime(),
+                    conference.getConnectionStartElapsedRealTime(),
                    conference.getStatusHints(),
                    conference.getExtras());