diff options
author | Evan Charlton <evanc@google.com> | 2014-11-08 15:49:16 -0800 |
---|---|---|
committer | Evan Charlton <evanc@google.com> | 2014-11-10 11:52:31 -0800 |
commit | 0e094d926c306c3667bcdf6f23c52cc7181f25f3 (patch) | |
tree | 4a41b85db95d9e74e3f2955083cef3d348927676 /telecomm/java/android/telecom/Conference.java | |
parent | 6c912b7d056c67b41fd46f31de168795e97c2336 (diff) | |
download | frameworks_base-0e094d926c306c3667bcdf6f23c52cc7181f25f3.zip frameworks_base-0e094d926c306c3667bcdf6f23c52cc7181f25f3.tar.gz frameworks_base-0e094d926c306c3667bcdf6f23c52cc7181f25f3.tar.bz2 |
Apply @hide / @SystemApi to android.telecom.*
Move the android.telecom.* namespace back to @hide, and also mark it
with @SystemApi so that system-privileged apps can use them.
Bug: 18302450
Change-Id: I33ae1b9b0dfdb1c5eff51ca3c829196bcfc9411c
Diffstat (limited to 'telecomm/java/android/telecom/Conference.java')
-rw-r--r-- | telecomm/java/android/telecom/Conference.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/Conference.java b/telecomm/java/android/telecom/Conference.java index 32bdbe0..215c682 100644 --- a/telecomm/java/android/telecom/Conference.java +++ b/telecomm/java/android/telecom/Conference.java @@ -16,6 +16,8 @@ package android.telecom; +import android.annotation.SystemApi; + import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -25,7 +27,9 @@ 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 */ |