diff options
| author | 2015-08-06 02:48:45 +0000 | |
|---|---|---|
| committer | 2015-08-06 02:48:45 +0000 | |
| commit | 25f9f7a482b464b0cfe909ccfb8bda295c9ebc35 (patch) | |
| tree | 23a0bd7eff00edeed0bbcce0e3ffc540891d4f97 | |
| parent | f22a58d1de4612b9555f25d1091a791dd81e4382 (diff) | |
| parent | e80dbaebd3b9d684b6eea253a998e5d12a8701d7 (diff) | |
am e80dbaeb: am 7be1e286: am cac65feb: am f0affc6d: Merge "Correctly hide setConnectionService" into mnc-dev
* commit 'e80dbaebd3b9d684b6eea253a998e5d12a8701d7':
Correctly hide setConnectionService
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/Connection.java | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index e16294edb380..05e494b3c22f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -30091,7 +30091,6 @@ package android.telecom { method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>); 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(); method public final void setDisconnected(android.telecom.DisconnectCause); method public final void setExtras(android.os.Bundle); diff --git a/api/system-current.txt b/api/system-current.txt index a784378e5f5f..d9702acf4069 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -32276,7 +32276,6 @@ package android.telecom { method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>); 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(); method public final void setDisconnected(android.telecom.DisconnectCause); method public final void setExtras(android.os.Bundle); diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index d66395263afd..7b277c5dcc94 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -1588,7 +1588,7 @@ public abstract class Connection extends Conferenceable { return mUnmodifiableConferenceables; } - /* + /** * @hide */ public final void setConnectionService(ConnectionService connectionService) { |