summaryrefslogtreecommitdiff
path: root/api
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2018-02-14 01:24:44 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-02-14 01:24:44 +0000
commit0f9643190e6f0dc8c711b901b74e39fc1aec2a72 (patch)
tree94dec57a34802883238c44687f232a1ff1a0fc86 /api
parent6a9fb9433306cbc3d0e1be3968729589f3218c65 (diff)
parent4c09901931c29ea014c9cc64e431475809495160 (diff)
Merge "Rename Conference#setConnectionElapsedTime to clarity." am: d1134525fc am: a0b41a82ce
am: 4c09901931 Change-Id: I493ade2029398983a76fd41fcf9f080ee2f06b95
Diffstat (limited to 'api')
-rw-r--r--api/current.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index 3edd2c08bcf3..63a40e5694a9 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -40731,8 +40731,8 @@ package android.telecom {
method public final void setActive();
method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);
method public final void setConnectionCapabilities(int);
- method public final void setConnectionElapsedTime(long);
method public final void setConnectionProperties(int);
+ method public final void setConnectionStartElapsedRealTime(long);
method public final void setConnectionTime(long);
method public final void setDialing();
method public final void setDisconnected(android.telecom.DisconnectCause);