summaryrefslogtreecommitdiffstats
path: root/telecomm/java/android/telecom/PhoneAccount.java
diff options
context:
space:
mode:
authorBrian Attwell <brianattwell@google.com>2014-12-19 11:37:16 -0800
committerBrian Attwell <brianattwell@google.com>2015-02-04 18:04:17 -0800
commitad147f4b59d42f48b73f6861f379535dbcc72b4a (patch)
treea3ff88e89877098e2675934a723dbc6c6f46c6f7 /telecomm/java/android/telecom/PhoneAccount.java
parent266fd264dbeb2c2667adf1f1ca41861b5b9f889a (diff)
downloadframeworks_base-ad147f4b59d42f48b73f6861f379535dbcc72b4a.zip
frameworks_base-ad147f4b59d42f48b73f6861f379535dbcc72b4a.tar.gz
frameworks_base-ad147f4b59d42f48b73f6861f379535dbcc72b4a.tar.bz2
Unhide telecom APIs needed by Contacts
* Removed @SystemApi and @hide from some telecom classes and APIs * Stopped using explicit @link's to ConnectionService, so that I didn't need to unhide ConnectionService * Added @SystemApi to hidden methods inside classes that I removed @SystemApi from. * Ran update-api. This picked up unrelated Math changes from b/11388705. Unbundling Bug: 18777272 Bug: 11388705 Change-Id: I218e0c3c0ae515d3deb2d3b67657db45a0bad999
Diffstat (limited to 'telecomm/java/android/telecom/PhoneAccount.java')
-rw-r--r--telecomm/java/android/telecom/PhoneAccount.java14
1 files changed, 10 insertions, 4 deletions
diff --git a/telecomm/java/android/telecom/PhoneAccount.java b/telecomm/java/android/telecom/PhoneAccount.java
index 052a481..a94c2f6 100644
--- a/telecomm/java/android/telecom/PhoneAccount.java
+++ b/telecomm/java/android/telecom/PhoneAccount.java
@@ -40,15 +40,13 @@ import java.util.MissingResourceException;
/**
* Represents a distinct method to place or receive a phone call. Apps which can place calls and
* want those calls to be integrated into the dialer and in-call UI should build an instance of
- * this class and register it with the system using {@link TelecomManager#registerPhoneAccount}.
+ * this class and register it with the system using {@link TelecomManager}.
* <p>
* {@link TelecomManager} uses registered {@link PhoneAccount}s to present the user with
* alternative options when placing a phone call. When building a {@link PhoneAccount}, the app
- * should supply a valid {@link PhoneAccountHandle} that references the {@link ConnectionService}
+ * should supply a valid {@link PhoneAccountHandle} that references the connection service
* implementation Telecom will use to interact with the app.
- * @hide
*/
-@SystemApi
public class PhoneAccount implements Parcelable {
/**
@@ -62,7 +60,9 @@ public class PhoneAccount implements Parcelable {
* if the user has explicitly selected it to be used as the default connection manager.
* <p>
* See {@link #getCapabilities}
+ * @hide
*/
+ @SystemApi
public static final int CAPABILITY_CONNECTION_MANAGER = 0x1;
/**
@@ -76,6 +76,7 @@ public class PhoneAccount implements Parcelable {
* <p>
* {@hide}
*/
+ @SystemApi
public static final int CAPABILITY_CALL_PROVIDER = 0x2;
/**
@@ -94,6 +95,7 @@ public class PhoneAccount implements Parcelable {
* See {@link #getCapabilities}
* @hide
*/
+ @SystemApi
public static final int CAPABILITY_VIDEO_CALLING = 0x8;
/**
@@ -111,6 +113,7 @@ public class PhoneAccount implements Parcelable {
* See {@link #getCapabilities}
* @hide
*/
+ @SystemApi
public static final int CAPABILITY_MULTI_USER = 0x20;
/**
@@ -203,6 +206,7 @@ public class PhoneAccount implements Parcelable {
}
/** @hide */
+ @SystemApi
public Builder setAccountHandle(PhoneAccountHandle accountHandle) {
mAccountHandle = accountHandle;
return this;
@@ -333,6 +337,7 @@ public class PhoneAccount implements Parcelable {
* @return The builder.
* @hide
*/
+ @SystemApi
public Builder addSupportedUriScheme(String uriScheme) {
if (!TextUtils.isEmpty(uriScheme) && !mSupportedUriSchemes.contains(uriScheme)) {
this.mSupportedUriSchemes.add(uriScheme);
@@ -423,6 +428,7 @@ public class PhoneAccount implements Parcelable {
* @return The builder.
* @hide
*/
+ @SystemApi
public Builder toBuilder() { return new Builder(this); }
/**