Merge "Unhide telecom APIs needed by Contacts" (dd26b2dd) · Commits · e / os / android_frameworks_base

api/current.txt

+88 −0

Original line number	Diff line number	Diff line
		@@ -28625,8 +28625,65 @@ package android.system {

		package android.telecom {

		public class PhoneAccount implements android.os.Parcelable {
		method public static android.telecom.PhoneAccount.Builder builder(android.telecom.PhoneAccountHandle, java.lang.CharSequence);
		method public android.graphics.drawable.Drawable createIconDrawable(android.content.Context);
		method public int describeContents();
		method public android.telecom.PhoneAccountHandle getAccountHandle();
		method public android.net.Uri getAddress();
		method public int getCapabilities();
		method public int getHighlightColor();
		method public android.graphics.Bitmap getIconBitmap();
		method public java.lang.String getIconPackageName();
		method public int getIconResId();
		method public int getIconTint();
		method public java.lang.CharSequence getLabel();
		method public java.lang.CharSequence getShortDescription();
		method public android.net.Uri getSubscriptionAddress();
		method public java.util.List<java.lang.String> getSupportedUriSchemes();
		method public boolean hasCapabilities(int);
		method public boolean supportsUriScheme(java.lang.String);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final int CAPABILITY_PLACE_EMERGENCY_CALLS = 16; // 0x10
		field public static final int CAPABILITY_SIM_SUBSCRIPTION = 4; // 0x4
		field public static final android.os.Parcelable.Creator<android.telecom.PhoneAccount> CREATOR;
		field public static final int NO_HIGHLIGHT_COLOR = 0; // 0x0
		field public static final int NO_ICON_TINT = 0; // 0x0
		field public static final int NO_RESOURCE_ID = -1; // 0xffffffff
		field public static final java.lang.String SCHEME_SIP = "sip";
		field public static final java.lang.String SCHEME_TEL = "tel";
		field public static final java.lang.String SCHEME_VOICEMAIL = "voicemail";
		}

		public static class PhoneAccount.Builder {
		ctor public PhoneAccount.Builder(android.telecom.PhoneAccountHandle, java.lang.CharSequence);
		ctor public PhoneAccount.Builder(android.telecom.PhoneAccount);
		method public android.telecom.PhoneAccount build();
		method public android.telecom.PhoneAccount.Builder setAddress(android.net.Uri);
		method public android.telecom.PhoneAccount.Builder setCapabilities(int);
		method public android.telecom.PhoneAccount.Builder setHighlightColor(int);
		method public android.telecom.PhoneAccount.Builder setIcon(android.content.Context, int);
		method public android.telecom.PhoneAccount.Builder setIcon(java.lang.String, int);
		method public android.telecom.PhoneAccount.Builder setIcon(android.content.Context, int, int);
		method public android.telecom.PhoneAccount.Builder setIcon(java.lang.String, int, int);
		method public android.telecom.PhoneAccount.Builder setIcon(android.graphics.Bitmap);
		method public android.telecom.PhoneAccount.Builder setShortDescription(java.lang.CharSequence);
		method public android.telecom.PhoneAccount.Builder setSubscriptionAddress(android.net.Uri);
		method public android.telecom.PhoneAccount.Builder setSupportedUriSchemes(java.util.List<java.lang.String>);
		}

		public class PhoneAccountHandle implements android.os.Parcelable {
		ctor public PhoneAccountHandle(android.content.ComponentName, java.lang.String);
		method public int describeContents();
		method public android.content.ComponentName getComponentName();
		method public java.lang.String getId();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.telecom.PhoneAccountHandle> CREATOR;
		}

		public class TelecomManager {
		method public void cancelMissedCallsNotification();
		method public android.telecom.PhoneAccount getPhoneAccount(android.telecom.PhoneAccountHandle);
		method public boolean handleMmi(java.lang.String);
		method public boolean isInCall();
		method public void showInCallScreen(boolean);
		@@ -28635,7 +28692,10 @@ package android.telecom {
		field public static final char DTMF_CHARACTER_WAIT = 59; // 0x003b ';'
		field public static final java.lang.String EXTRA_CALL_DISCONNECT_CAUSE = "android.telecom.extra.CALL_DISCONNECT_CAUSE";
		field public static final java.lang.String EXTRA_CALL_DISCONNECT_MESSAGE = "android.telecom.extra.CALL_DISCONNECT_MESSAGE";
		field public static final java.lang.String EXTRA_OUTGOING_CALL_EXTRAS = "android.telecom.extra.OUTGOING_CALL_EXTRAS";
		field public static final java.lang.String EXTRA_PHONE_ACCOUNT_HANDLE = "android.telecom.extra.PHONE_ACCOUNT_HANDLE";
		field public static final java.lang.String EXTRA_START_CALL_WITH_SPEAKERPHONE = "android.telecom.extra.START_CALL_WITH_SPEAKERPHONE";
		field public static final java.lang.String EXTRA_START_CALL_WITH_VIDEO_STATE = "android.telecom.extra.START_CALL_WITH_VIDEO_STATE";
		field public static final java.lang.String GATEWAY_ORIGINAL_ADDRESS = "android.telecom.extra.GATEWAY_ORIGINAL_ADDRESS";
		field public static final java.lang.String GATEWAY_PROVIDER_PACKAGE = "android.telecom.extra.GATEWAY_PROVIDER_PACKAGE";
		field public static final int PRESENTATION_ALLOWED = 1; // 0x1
		@@ -28644,6 +28704,34 @@ package android.telecom {
		field public static final int PRESENTATION_UNKNOWN = 3; // 0x3
		}

		public class VideoProfile implements android.os.Parcelable {
		ctor public VideoProfile(int);
		ctor public VideoProfile(int, int);
		method public int describeContents();
		method public int getQuality();
		method public int getVideoState();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.telecom.VideoProfile> CREATOR;
		field public static final int QUALITY_DEFAULT = 4; // 0x4
		field public static final int QUALITY_HIGH = 1; // 0x1
		field public static final int QUALITY_LOW = 3; // 0x3
		field public static final int QUALITY_MEDIUM = 2; // 0x2
		}

		public static class VideoProfile.VideoState {
		ctor public VideoProfile.VideoState();
		method public static boolean isAudioOnly(int);
		method public static boolean isBidirectional(int);
		method public static boolean isPaused(int);
		method public static boolean isReceptionEnabled(int);
		method public static boolean isTransmissionEnabled(int);
		field public static final int AUDIO_ONLY = 0; // 0x0
		field public static final int BIDIRECTIONAL = 3; // 0x3
		field public static final int PAUSED = 4; // 0x4
		field public static final int RX_ENABLED = 2; // 0x2
		field public static final int TX_ENABLED = 1; // 0x1
		}

		}

		package android.telephony {

api/system-current.txt

+37 −0

Original line number	Diff line number	Diff line
		@@ -30630,10 +30630,14 @@ package android.telecom {
		method public java.util.List<java.lang.String> getSupportedUriSchemes();
		method public boolean hasCapabilities(int);
		method public boolean supportsUriScheme(java.lang.String);
		method public android.telecom.PhoneAccount.Builder toBuilder();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final int CAPABILITY_CALL_PROVIDER = 2; // 0x2
		field public static final int CAPABILITY_CONNECTION_MANAGER = 1; // 0x1
		field public static final int CAPABILITY_MULTI_USER = 32; // 0x20
		field public static final int CAPABILITY_PLACE_EMERGENCY_CALLS = 16; // 0x10
		field public static final int CAPABILITY_SIM_SUBSCRIPTION = 4; // 0x4
		field public static final int CAPABILITY_VIDEO_CALLING = 8; // 0x8
		field public static final android.os.Parcelable.Creator<android.telecom.PhoneAccount> CREATOR;
		field public static final int NO_HIGHLIGHT_COLOR = 0; // 0x0
		field public static final int NO_ICON_TINT = 0; // 0x0
		@@ -30646,7 +30650,9 @@ package android.telecom {
		public static class PhoneAccount.Builder {
		ctor public PhoneAccount.Builder(android.telecom.PhoneAccountHandle, java.lang.CharSequence);
		ctor public PhoneAccount.Builder(android.telecom.PhoneAccount);
		method public android.telecom.PhoneAccount.Builder addSupportedUriScheme(java.lang.String);
		method public android.telecom.PhoneAccount build();
		method public android.telecom.PhoneAccount.Builder setAccountHandle(android.telecom.PhoneAccountHandle);
		method public android.telecom.PhoneAccount.Builder setAddress(android.net.Uri);
		method public android.telecom.PhoneAccount.Builder setCapabilities(int);
		method public android.telecom.PhoneAccount.Builder setHighlightColor(int);
		@@ -30662,9 +30668,11 @@ package android.telecom {

		public class PhoneAccountHandle implements android.os.Parcelable {
		ctor public PhoneAccountHandle(android.content.ComponentName, java.lang.String);
		ctor public PhoneAccountHandle(android.content.ComponentName, java.lang.String, android.os.UserHandle);
		method public int describeContents();
		method public android.content.ComponentName getComponentName();
		method public java.lang.String getId();
		method public android.os.UserHandle getUserHandle();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.telecom.PhoneAccountHandle> CREATOR;
		}
		@@ -30800,6 +30808,7 @@ package android.telecom {
		field public static final java.lang.String EXTRA_OUTGOING_CALL_EXTRAS = "android.telecom.extra.OUTGOING_CALL_EXTRAS";
		field public static final java.lang.String EXTRA_PHONE_ACCOUNT_HANDLE = "android.telecom.extra.PHONE_ACCOUNT_HANDLE";
		field public static final java.lang.String EXTRA_START_CALL_WITH_SPEAKERPHONE = "android.telecom.extra.START_CALL_WITH_SPEAKERPHONE";
		field public static final java.lang.String EXTRA_START_CALL_WITH_VIDEO_STATE = "android.telecom.extra.START_CALL_WITH_VIDEO_STATE";
		field public static final java.lang.String GATEWAY_ORIGINAL_ADDRESS = "android.telecom.extra.GATEWAY_ORIGINAL_ADDRESS";
		field public static final java.lang.String GATEWAY_PROVIDER_PACKAGE = "android.telecom.extra.GATEWAY_PROVIDER_PACKAGE";
		field public static final int PRESENTATION_ALLOWED = 1; // 0x1
		@@ -30808,6 +30817,34 @@ package android.telecom {
		field public static final int PRESENTATION_UNKNOWN = 3; // 0x3
		}

		public class VideoProfile implements android.os.Parcelable {
		ctor public VideoProfile(int);
		ctor public VideoProfile(int, int);
		method public int describeContents();
		method public int getQuality();
		method public int getVideoState();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.telecom.VideoProfile> CREATOR;
		field public static final int QUALITY_DEFAULT = 4; // 0x4
		field public static final int QUALITY_HIGH = 1; // 0x1
		field public static final int QUALITY_LOW = 3; // 0x3
		field public static final int QUALITY_MEDIUM = 2; // 0x2
		}

		public static class VideoProfile.VideoState {
		ctor public VideoProfile.VideoState();
		method public static boolean isAudioOnly(int);
		method public static boolean isBidirectional(int);
		method public static boolean isPaused(int);
		method public static boolean isReceptionEnabled(int);
		method public static boolean isTransmissionEnabled(int);
		field public static final int AUDIO_ONLY = 0; // 0x0
		field public static final int BIDIRECTIONAL = 3; // 0x3
		field public static final int PAUSED = 4; // 0x4
		field public static final int RX_ENABLED = 2; // 0x2
		field public static final int TX_ENABLED = 1; // 0x1
		}

		}

		package android.telephony {

telecomm/java/android/telecom/PhoneAccount.java

+10 −4

Original line number	Diff line number	Diff line
		@@ -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); }

		/**

telecomm/java/android/telecom/PhoneAccountHandle.java

+8 −9

Original line number	Diff line number	Diff line
		@@ -29,16 +29,13 @@ import java.util.Objects;
		* The unique identifier for a {@link PhoneAccount}. A {@code PhoneAccountHandle} is made of two
		* parts:
		* <ul>
		* <li>The component name of the associated {@link ConnectionService}.</li>
		* <li>The component name of the associated connection service.</li>
		* <li>A string identifier that is unique across {@code PhoneAccountHandle}s with the same
		* component name.</li>
		* </ul>
		*
		* See {@link PhoneAccount},
		* {@link TelecomManager#registerPhoneAccount TelecomManager.registerPhoneAccount}.
		* @hide
		* See {@link PhoneAccount}, {@link TelecomManager}.
		*/
		@SystemApi
		public class PhoneAccountHandle implements Parcelable {
		private final ComponentName mComponentName;
		private final String mId;
		@@ -51,6 +48,7 @@ public class PhoneAccountHandle implements Parcelable {
		}

		/** @hide */
		@SystemApi
		public PhoneAccountHandle(
		ComponentName componentName,
		String id,
		@@ -61,8 +59,8 @@ public class PhoneAccountHandle implements Parcelable {
		}

		/**
		* The {@code ComponentName} of the {@link android.telecom.ConnectionService} which is
		* responsible for making phone calls using this {@code PhoneAccountHandle}.
		* The {@code ComponentName} of the connection service which is responsible for making phone
		* calls using this {@code PhoneAccountHandle}.
		*
		* @return A suitable {@code ComponentName}.
		*/
		@@ -72,9 +70,9 @@ public class PhoneAccountHandle implements Parcelable {

		/**
		* A string that uniquely distinguishes this particular {@code PhoneAccountHandle} from all the
		* others supported by the {@link ConnectionService} that created it.
		* others supported by the connection service that created it.
		* <p>
		* A {@code ConnectionService} must select identifiers that are stable for the lifetime of
		* A connection service must select identifiers that are stable for the lifetime of
		* their users' relationship with their service, across many Android devices. For example, a
		* good set of identifiers might be the email addresses with which with users registered for
		* their accounts with a particular service. Depending on how a service chooses to operate,
		@@ -92,6 +90,7 @@ public class PhoneAccountHandle implements Parcelable {
		* @return the {@link UserHandle} to use when connecting to this PhoneAccount.
		* @hide
		*/
		@SystemApi
		public UserHandle getUserHandle() {
		return mUserHandle;
		}

telecomm/java/android/telecom/TelecomManager.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -106,7 +106,6 @@ public class TelecomManager {
		* {@link VideoProfile.VideoState#BIDIRECTIONAL},
		* {@link VideoProfile.VideoState#RX_ENABLED},
		* {@link VideoProfile.VideoState#TX_ENABLED}.
		* @hide
		*/
		public static final String EXTRA_START_CALL_WITH_VIDEO_STATE =
		"android.telecom.extra.START_CALL_WITH_VIDEO_STATE";
		@@ -117,9 +116,7 @@ public class TelecomManager {
		* {@link PhoneAccountHandle} to use when making the call.
		* <p class="note">
		* Retrieve with {@link android.content.Intent#getParcelableExtra(String)}.
		* @hide
		*/
		@SystemApi
		public static final String EXTRA_PHONE_ACCOUNT_HANDLE =
		"android.telecom.extra.PHONE_ACCOUNT_HANDLE";

		@@ -139,10 +136,7 @@ public class TelecomManager {
		* {@link android.content.Intent#ACTION_DIAL} {@code Intent} containing a {@link Bundle}
		* which contains metadata about the call. This {@link Bundle} will be saved into
		* {@code Call.Details}.
		*
		* @hide
		*/
		@SystemApi
		public static final String EXTRA_OUTGOING_CALL_EXTRAS =
		"android.telecom.extra.OUTGOING_CALL_EXTRAS";

		@@ -554,9 +548,7 @@ public class TelecomManager {
		*
		* @param account The {@link PhoneAccountHandle}.
		* @return The {@link PhoneAccount} object.
		* @hide
		*/
		@SystemApi
		public PhoneAccount getPhoneAccount(PhoneAccountHandle account) {
		try {
		if (isServiceConnected()) {