summaryrefslogtreecommitdiffstats
path: root/telecomm
diff options
context:
space:
mode:
authorSimon Shields <keepcalm444@gmail.com>2015-12-16 13:23:23 +1100
committerGerrit Code Review <gerrit@cyanogenmod.org>2015-12-16 09:15:48 -0800
commit8c15ebcd141bcc740e18956469d644fccc223e18 (patch)
tree1fd6636febfa9b85d773f5aec4ffcb396a4295fe /telecomm
parent36dea102342f686b6caad89a358745d9f2e72071 (diff)
downloadframeworks_base-8c15ebcd141bcc740e18956469d644fccc223e18.zip
frameworks_base-8c15ebcd141bcc740e18956469d644fccc223e18.tar.gz
frameworks_base-8c15ebcd141bcc740e18956469d644fccc223e18.tar.bz2
fix checkapi
Change-Id: I09fa1f177c7782e82cdb9a3c9ba6e02afde51a12
Diffstat (limited to 'telecomm')
-rw-r--r--telecomm/java/android/telecom/Connection.java3
-rw-r--r--telecomm/java/android/telecom/RemoteConference.java2
2 files changed, 5 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java
index 1f3a906..01582a8 100644
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -505,6 +505,9 @@ public abstract class Connection extends Conferenceable {
mConnectionProperties |= property;
}
+ /**
+ * @hide
+ */
public static String propertiesToString(int properties) {
StringBuilder builder = new StringBuilder();
builder.append("[Properties:");
diff --git a/telecomm/java/android/telecom/RemoteConference.java b/telecomm/java/android/telecom/RemoteConference.java
index bdce033..8136c7d 100644
--- a/telecomm/java/android/telecom/RemoteConference.java
+++ b/telecomm/java/android/telecom/RemoteConference.java
@@ -97,6 +97,7 @@ public final class RemoteConference {
*
* @param conference The {@code RemoteConference} invoking this method.
* @param connectionProperties The new properties of the {@code RemoteConference}.
+ * @hide
*/
public void onConnectionPropertiesChanged(
RemoteConference conference,
@@ -356,6 +357,7 @@ public final class RemoteConference {
* {@link Connection} for valid values.
*
* @return A bitmask of the properties of the conference call.
+ * @hide
*/
public final int getConnectionProperties() {
return mConnectionProperties;