diff options
| author | Tyler Gunn <tgunn@google.com> | 2018-02-14 01:24:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-14 01:24:44 +0000 |
| commit | 0f9643190e6f0dc8c711b901b74e39fc1aec2a72 (patch) | |
| tree | 94dec57a34802883238c44687f232a1ff1a0fc86 /telecomm/java/android/telecom/ConnectionService.java | |
| parent | 6a9fb9433306cbc3d0e1be3968729589f3218c65 (diff) | |
| parent | 4c09901931c29ea014c9cc64e431475809495160 (diff) | |
Merge "Rename Conference#setConnectionElapsedTime to clarity." am: d1134525fc am: a0b41a82ce
am: 4c09901931
Change-Id: I493ade2029398983a76fd41fcf9f080ee2f06b95
Diffstat (limited to 'telecomm/java/android/telecom/ConnectionService.java')
| -rw-r--r-- | telecomm/java/android/telecom/ConnectionService.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java index 211699ea5940..1547857f23e3 100644 --- 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()); |