diff options
| author | Tyler Gunn <tgunn@google.com> | 2015-04-20 20:12:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-20 20:13:51 +0000 |
| commit | 10d8f97c60557251c13996af5f90f750fdfe5dff (patch) | |
| tree | 8210f6a321c71dc69122e044fdac52d2502c0cbc /system-api | |
| parent | 5e7cba5f50851acbe434a9c05ced66673cc91791 (diff) | |
| parent | b49614418e8365f586ac9a9ef5cc8944c45fff73 (diff) | |
| download | prebuilts_sdk-10d8f97c60557251c13996af5f90f750fdfe5dff.zip prebuilts_sdk-10d8f97c60557251c13996af5f90f750fdfe5dff.tar.gz prebuilts_sdk-10d8f97c60557251c13996af5f90f750fdfe5dff.tar.bz2 | |
Merge "API Cleanup - rename IConferenceable to Conferenceable."
Diffstat (limited to 'system-api')
| -rw-r--r-- | system-api/23.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/system-api/23.txt b/system-api/23.txt index 5c142e7..83dd8c4 100644 --- a/system-api/23.txt +++ b/system-api/23.txt @@ -29903,7 +29903,7 @@ package android.telecom { field public static final int RINGING = 4; // 0x4 } - public abstract class Conference implements android.telecom.IConferenceable { + public abstract class Conference implements android.telecom.Conferenceable { ctor public Conference(android.telecom.PhoneAccountHandle); method public final boolean addConnection(android.telecom.Connection); method public final void destroy(); @@ -29937,7 +29937,7 @@ package android.telecom { field public static final long CONNECT_TIME_NOT_SPECIFIED = 0L; // 0x0L } - public abstract class Connection implements android.telecom.IConferenceable { + public abstract class Connection implements android.telecom.Conferenceable { ctor public Connection(); method public static java.lang.String capabilitiesToString(int); method public static android.telecom.Connection createCanceledConnection(); @@ -29950,7 +29950,7 @@ package android.telecom { method public final java.lang.String getCallerDisplayName(); method public final int getCallerDisplayNamePresentation(); method public final android.telecom.Conference getConference(); - method public final java.util.List<android.telecom.IConferenceable> getConferenceables(); + method public final java.util.List<android.telecom.Conferenceable> getConferenceables(); method public final int getConnectionCapabilities(); method public final android.telecom.DisconnectCause getDisconnectCause(); method public final int getState(); @@ -29973,7 +29973,7 @@ package android.telecom { method public final void setAudioModeIsVoip(boolean); method public final void setCallerDisplayName(java.lang.String, int); method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>); - method public final void setConferenceables(java.util.List<android.telecom.IConferenceable>); + method public final void setConferenceables(java.util.List<android.telecom.Conferenceable>); method public final void setConnectionCapabilities(int); method public final void setConnectionService(android.telecom.ConnectionService); method public final void setDialing(); @@ -30068,7 +30068,7 @@ package android.telecom { field public static final android.os.Parcelable.Creator<android.telecom.GatewayInfo> CREATOR; } - public abstract interface IConferenceable { + public abstract interface Conferenceable { } public abstract class InCallService extends android.app.Service { |