summaryrefslogtreecommitdiffstats
path: root/telecomm/java/android/telecom/Connection.java
diff options
context:
space:
mode:
authorEvan Charlton <evanc@google.com>2014-09-24 14:04:51 -0700
committerEvan Charlton <evanc@google.com>2014-09-24 14:06:12 -0700
commit8635c578f0408ca76cbaef5464d27bfde7450425 (patch)
tree401de5293f121501d4b42bcc9d790c85ae1bbc9f /telecomm/java/android/telecom/Connection.java
parent00f484f9705a13913e8ba8fbe950fcc8bc56f742 (diff)
downloadframeworks_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/Connection.java')
-rw-r--r--telecomm/java/android/telecom/Connection.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java
index 13acc59..7979e44 100644
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -19,7 +19,6 @@ package android.telecom;
import com.android.internal.telecom.IVideoCallback;
import com.android.internal.telecom.IVideoProvider;
-import android.annotation.SystemApi;
import android.net.Uri;
import android.os.Handler;
import android.os.IBinder;
@@ -44,9 +43,7 @@ import java.util.concurrent.ConcurrentHashMap;
* Implementations are then responsible for updating the state of the {@code Connection}, and
* must call {@link #destroy()} to signal to the framework that the {@code Connection} is no
* longer used and associated resources may be recovered.
- * @hide
*/
-@SystemApi
public abstract class Connection {
public static final int STATE_INITIALIZING = 0;
@@ -876,7 +873,7 @@ public abstract class Connection {
return mUnmodifiableConferenceableConnections;
}
- /**
+ /*
* @hide
*/
public final void setConnectionService(ConnectionService connectionService) {