Merge "Hide APIs introduced in earlier commit" into rvc-dev am: 97363dce3c am:... (0d05f04c) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −4

Original line number	Diff line number	Diff line
		@@ -45974,9 +45974,6 @@ package android.telecom {
		field public static final int MISSED = 5; // 0x5
		field public static final int OTHER = 9; // 0x9
		field public static final String REASON_EMERGENCY_CALL_PLACED = "REASON_EMERGENCY_CALL_PLACED";
		field public static final String REASON_EMULATING_SINGLE_CALL = "EMULATING_SINGLE_CALL";
		field public static final String REASON_IMS_ACCESS_BLOCKED = "REASON_IMS_ACCESS_BLOCKED";
		field public static final String REASON_WIFI_ON_BUT_WFC_OFF = "REASON_WIFI_ON_BUT_WFC_OFF";
		field public static final int REJECTED = 6; // 0x6
		field public static final int REMOTE = 3; // 0x3
		field public static final int RESTRICTED = 8; // 0x8
		@@ -46303,7 +46300,6 @@ package android.telecom {
		field public static final int DURATION_SHORT = 1; // 0x1
		field public static final int DURATION_VERY_SHORT = 0; // 0x0
		field public static final String EXTRA_CALL_BACK_NUMBER = "android.telecom.extra.CALL_BACK_NUMBER";
		field public static final String EXTRA_CALL_CREATED_TIME_MILLIS = "android.telecom.extra.CALL_CREATED_TIME_MILLIS";
		field public static final String EXTRA_CALL_DISCONNECT_CAUSE = "android.telecom.extra.CALL_DISCONNECT_CAUSE";
		field public static final String EXTRA_CALL_DISCONNECT_MESSAGE = "android.telecom.extra.CALL_DISCONNECT_MESSAGE";
		field public static final String EXTRA_CALL_DURATION = "android.telecom.extra.CALL_DURATION";

api/system-current.txt

+0 −14

Original line number	Diff line number	Diff line
		@@ -10647,14 +10647,7 @@ package android.telecom {
		}

		public final class PhoneAccount implements android.os.Parcelable {
		field public static final int CAPABILITY_EMERGENCY_CALLS_ONLY = 128; // 0x80
		field public static final int CAPABILITY_EMERGENCY_PREFERRED = 8192; // 0x2000
		field public static final int CAPABILITY_EMERGENCY_VIDEO_CALLING = 512; // 0x200
		field public static final int CAPABILITY_MULTI_USER = 32; // 0x20
		field public static final String EXTRA_ALWAYS_USE_VOIP_AUDIO_MODE = "android.telecom.extra.ALWAYS_USE_VOIP_AUDIO_MODE";
		field public static final String EXTRA_PLAY_CALL_RECORDING_TONE = "android.telecom.extra.PLAY_CALL_RECORDING_TONE";
		field public static final String EXTRA_SORT_ORDER = "android.telecom.extra.SORT_ORDER";
		field public static final String EXTRA_SUPPORTS_VIDEO_CALLING_FALLBACK = "android.telecom.extra.SUPPORTS_VIDEO_CALLING_FALLBACK";
		}

		public static class PhoneAccount.Builder {
		@@ -10740,20 +10733,13 @@ package android.telecom {
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean isInEmergencyCall();
		method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isRinging();
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUserSelectedOutgoingPhoneAccount(@Nullable android.telecom.PhoneAccountHandle);
		field public static final String ACTION_CURRENT_TTY_MODE_CHANGED = "android.telecom.action.CURRENT_TTY_MODE_CHANGED";
		field public static final String ACTION_TTY_PREFERRED_MODE_CHANGED = "android.telecom.action.TTY_PREFERRED_MODE_CHANGED";
		field public static final int CALL_SOURCE_EMERGENCY_DIALPAD = 1; // 0x1
		field public static final int CALL_SOURCE_EMERGENCY_SHORTCUT = 2; // 0x2
		field public static final int CALL_SOURCE_UNSPECIFIED = 0; // 0x0
		field public static final String EXTRA_CALL_BACK_INTENT = "android.telecom.extra.CALL_BACK_INTENT";
		field public static final String EXTRA_CALL_SOURCE = "android.telecom.extra.CALL_SOURCE";
		field public static final String EXTRA_CALL_TECHNOLOGY_TYPE = "android.telecom.extra.CALL_TECHNOLOGY_TYPE";
		field public static final String EXTRA_CLEAR_MISSED_CALLS_INTENT = "android.telecom.extra.CLEAR_MISSED_CALLS_INTENT";
		field public static final String EXTRA_CONNECTION_SERVICE = "android.telecom.extra.CONNECTION_SERVICE";
		field public static final String EXTRA_CURRENT_TTY_MODE = "android.telecom.extra.CURRENT_TTY_MODE";
		field public static final String EXTRA_IS_USER_INTENT_EMERGENCY_CALL = "android.telecom.extra.IS_USER_INTENT_EMERGENCY_CALL";
		field public static final String EXTRA_TTY_PREFERRED_MODE = "android.telecom.extra.TTY_PREFERRED_MODE";
		field public static final String EXTRA_UNKNOWN_CALL_HANDLE = "android.telecom.extra.UNKNOWN_CALL_HANDLE";
		field public static final int TTY_MODE_FULL = 1; // 0x1
		field public static final int TTY_MODE_HCO = 2; // 0x2
		field public static final int TTY_MODE_OFF = 0; // 0x0

telecomm/java/android/telecom/DisconnectCause.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -80,17 +80,20 @@ public final class DisconnectCause implements Parcelable {
		* Reason code (returned via {@link #getReason()}) which indicates that a call could not be
		* completed because the cellular radio is off or out of service, the device is connected to
		* a wifi network, but the user has not enabled wifi calling.
		* @hide
		*/
		public static final String REASON_WIFI_ON_BUT_WFC_OFF = "REASON_WIFI_ON_BUT_WFC_OFF";

		/**
		* Reason code (returned via {@link #getReason()}), which indicates that the video telephony
		* call was disconnected because IMS access is blocked.
		* @hide
		*/
		public static final String REASON_IMS_ACCESS_BLOCKED = "REASON_IMS_ACCESS_BLOCKED";

		/**
		* Reason code, which indicates that the conference call is simulating single party conference.
		* @hide
		*/
		public static final String REASON_EMULATING_SINGLE_CALL = "EMULATING_SINGLE_CALL";

telecomm/java/android/telecom/PhoneAccount.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -53,7 +53,6 @@ public final class PhoneAccount implements Parcelable {
		* {@link android.telecom.ConnectionService}.
		* @hide
		*/
		@SystemApi
		public static final String EXTRA_SORT_ORDER =
		"android.telecom.extra.SORT_ORDER";

		@@ -89,7 +88,6 @@ public final class PhoneAccount implements Parcelable {
		* rather than cellular calls.
		* @hide
		*/
		@SystemApi
		public static final String EXTRA_ALWAYS_USE_VOIP_AUDIO_MODE =
		"android.telecom.extra.ALWAYS_USE_VOIP_AUDIO_MODE";

		@@ -114,7 +112,6 @@ public final class PhoneAccount implements Parcelable {
		*
		* @hide
		*/
		@SystemApi
		public static final String EXTRA_SUPPORTS_VIDEO_CALLING_FALLBACK =
		"android.telecom.extra.SUPPORTS_VIDEO_CALLING_FALLBACK";

		@@ -163,7 +160,6 @@ public final class PhoneAccount implements Parcelable {
		* in progress.
		* @hide
		*/
		@SystemApi
		public static final String EXTRA_PLAY_CALL_RECORDING_TONE =
		"android.telecom.extra.PLAY_CALL_RECORDING_TONE";

		@@ -258,7 +254,6 @@ public final class PhoneAccount implements Parcelable {
		* See {@link #getCapabilities}
		* @hide
		*/
		@SystemApi
		public static final int CAPABILITY_EMERGENCY_CALLS_ONLY = 0x80;

		/**
		@@ -282,7 +277,6 @@ public final class PhoneAccount implements Parcelable {
		* convert all outgoing video calls to emergency numbers to audio-only.
		* @hide
		*/
		@SystemApi
		public static final int CAPABILITY_EMERGENCY_VIDEO_CALLING = 0x200;

		/**
		@@ -340,7 +334,6 @@ public final class PhoneAccount implements Parcelable {
		*
		* @hide
		*/
		@SystemApi
		public static final int CAPABILITY_EMERGENCY_PREFERRED = 0x2000;

		/**

telecomm/java/android/telecom/TelecomManager.java

+1 −7

Original line number	Diff line number	Diff line
		@@ -318,13 +318,13 @@ public class TelecomManager {
		* the remote handle of the new call.
		* @hide
		*/
		@SystemApi
		public static final String EXTRA_UNKNOWN_CALL_HANDLE =
		"android.telecom.extra.UNKNOWN_CALL_HANDLE";

		/**
		* Optional extra for incoming and outgoing calls containing a long which specifies the time the
		* call was created. This value is in milliseconds since boot.
		* @hide
		*/
		public static final String EXTRA_CALL_CREATED_TIME_MILLIS =
		"android.telecom.extra.CALL_CREATED_TIME_MILLIS";
		@@ -388,7 +388,6 @@ public class TelecomManager {
		* </ul>
		* @hide
		*/
		@SystemApi
		public static final String EXTRA_CALL_TECHNOLOGY_TYPE =
		"android.telecom.extra.CALL_TECHNOLOGY_TYPE";

		@@ -731,7 +730,6 @@ public class TelecomManager {
		* @see #EXTRA_CURRENT_TTY_MODE
		* @hide
		*/
		@SystemApi
		public static final String ACTION_CURRENT_TTY_MODE_CHANGED =
		"android.telecom.action.CURRENT_TTY_MODE_CHANGED";

		@@ -746,7 +744,6 @@ public class TelecomManager {
		* </ul>
		* @hide
		*/
		@SystemApi
		public static final String EXTRA_CURRENT_TTY_MODE =
		"android.telecom.extra.CURRENT_TTY_MODE";

		@@ -757,7 +754,6 @@ public class TelecomManager {
		* @see #EXTRA_TTY_PREFERRED_MODE
		* @hide
		*/
		@SystemApi
		public static final String ACTION_TTY_PREFERRED_MODE_CHANGED =
		"android.telecom.action.TTY_PREFERRED_MODE_CHANGED";

		@@ -768,7 +764,6 @@ public class TelecomManager {
		*
		* @hide
		*/
		@SystemApi
		public static final String EXTRA_TTY_PREFERRED_MODE =
		"android.telecom.extra.TTY_PREFERRED_MODE";

		@@ -846,7 +841,6 @@ public class TelecomManager {
		*
		* @hide
		*/
		@SystemApi
		public static final String EXTRA_CALL_SOURCE = "android.telecom.extra.CALL_SOURCE";

		/**