diff options
| author | Evan Charlton <evanc@google.com> | 2014-09-24 14:04:51 -0700 |
|---|---|---|
| committer | Evan Charlton <evanc@google.com> | 2014-09-24 14:06:12 -0700 |
| commit | 8635c578f0408ca76cbaef5464d27bfde7450425 (patch) | |
| tree | 401de5293f121501d4b42bcc9d790c85ae1bbc9f /telecomm/java/android/telecom/Conference.java | |
| parent | 00f484f9705a13913e8ba8fbe950fcc8bc56f742 (diff) | |
| download | frameworks_base-8635c578f0408ca76cbaef5464d27bfde7450425.zip frameworks_base-8635c578f0408ca76cbaef5464d27bfde7450425.tar.gz frameworks_base-8635c578f0408ca76cbaef5464d27bfde7450425.tar.bz2 | |
Revert "@hide ConnectionService APIs."
This reverts commit 86935c406e4a8bb0e2ad871b51009f3603df9e87.
Diffstat (limited to 'telecomm/java/android/telecom/Conference.java')
| -rw-r--r-- | telecomm/java/android/telecom/Conference.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/telecomm/java/android/telecom/Conference.java b/telecomm/java/android/telecom/Conference.java index e47d9d1..9b350c1 100644 --- a/telecomm/java/android/telecom/Conference.java +++ b/telecomm/java/android/telecom/Conference.java @@ -16,8 +16,6 @@ package android.telecom; -import android.annotation.SystemApi; - import java.util.Collections; import java.util.List; import java.util.Set; @@ -26,9 +24,7 @@ import java.util.concurrent.CopyOnWriteArraySet; /** * Represents a conference call which can contain any number of {@link Connection} objects. - * @hide */ -@SystemApi public abstract class Conference { /** @hide */ |