commit 55b97525f0f50857f1ab0acd2608053fd0f3416c
author Jay Shrauner <shrauner@google.com> Thu Apr 09 15:15:43 2015 -0700
committer Jay Shrauner <shrauner@google.com> Wed Apr 15 12:03:48 2015 -0700
tree e2c5a1dba83a3f53a88a6463cbea49118b441c44
parent 250dd262910c3a79e87746d3c5519cb3c7e66cab

Make Telecom/InCallUI APIs public

Bug:20260870
Change-Id: Ie3a2db0685664f2f1ceea8f40b1249d01e9385b8

telecomm/java/android/telecom/Conference.java

diff --git a/telecomm/java/android/telecom/Conference.java b/telecomm/java/android/telecom/Conference.java
index c37460b..15a1da1 100644
--- a/telecomm/java/android/telecom/Conference.java
+++ b/telecomm/java/android/telecom/Conference.java
@@ -16,7 +16,6 @@
 
 package android.telecom;
 
-import android.annotation.SystemApi;
 import android.telecom.Connection.VideoProvider;
 
 import java.util.ArrayList;
@@ -29,9 +28,7 @@
 
 /**
  * Represents a conference call which can contain any number of {@link Connection} objects.
- * @hide
  */
-@SystemApi
 public abstract class Conference implements IConferenceable {
 
     /**
@@ -487,7 +484,7 @@
      *
      * @return The time the {@code Conference} has been connected.
      */
-    public long getConnectTimeMillis() {
+    public final long getConnectTimeMillis() {
         return mConnectTimeMillis;
     }