Merge "Expose Telecom constants for use in Telephony" (9fcb2819) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -45970,6 +45970,8 @@ 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_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
		@@ -46064,6 +46066,7 @@ package android.telecom {
		field public static final int CAPABILITY_VIDEO_CALLING = 8; // 0x8
		field public static final int CAPABILITY_VIDEO_CALLING_RELIES_ON_PRESENCE = 256; // 0x100
		field @NonNull public static final android.os.Parcelable.Creator<android.telecom.PhoneAccount> CREATOR;
		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_CALL_SUBJECT_CHARACTER_ENCODING = "android.telecom.extra.CALL_SUBJECT_CHARACTER_ENCODING";
		field public static final String EXTRA_CALL_SUBJECT_MAX_LENGTH = "android.telecom.extra.CALL_SUBJECT_MAX_LENGTH";
		field public static final String EXTRA_LOG_SELF_MANAGED_CALLS = "android.telecom.extra.LOG_SELF_MANAGED_CALLS";

api/system-current.txt

+19 −0

Original line number	Diff line number	Diff line
		@@ -10249,6 +10249,10 @@ package android.telecom {
		method public final void addExistingConnection(@NonNull android.telecom.PhoneAccountHandle, @NonNull android.telecom.Connection, @NonNull android.telecom.Conference);
		}

		public final class DisconnectCause implements android.os.Parcelable {
		field public static final String REASON_EMULATING_SINGLE_CALL = "EMULATING_SINGLE_CALL";
		}

		public abstract class InCallService extends android.app.Service {
		method @Deprecated public android.telecom.Phone getPhone();
		method @Deprecated public void onPhoneCreated(android.telecom.Phone);
		@@ -10377,7 +10381,12 @@ 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_PLAY_CALL_RECORDING_TONE = "android.telecom.extra.PLAY_CALL_RECORDING_TONE";
		field public static final String EXTRA_SORT_ORDER = "android.telecom.extra.SORT_ORDER";
		}

		public static class PhoneAccount.Builder {
		@@ -10463,10 +10472,20 @@ 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

api/test-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -3928,6 +3928,10 @@ package android.telecom {
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean isInEmergencyCall();
		method @RequiresPermission(anyOf={"android.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 String EXTRA_CURRENT_TTY_MODE = "android.telecom.extra.CURRENT_TTY_MODE";
		field public static final String EXTRA_TTY_PREFERRED_MODE = "android.telecom.extra.TTY_PREFERRED_MODE";
		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

non-updatable-api/current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -44138,6 +44138,8 @@ 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_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
		@@ -44232,6 +44234,7 @@ package android.telecom {
		field public static final int CAPABILITY_VIDEO_CALLING = 8; // 0x8
		field public static final int CAPABILITY_VIDEO_CALLING_RELIES_ON_PRESENCE = 256; // 0x100
		field @NonNull public static final android.os.Parcelable.Creator<android.telecom.PhoneAccount> CREATOR;
		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_CALL_SUBJECT_CHARACTER_ENCODING = "android.telecom.extra.CALL_SUBJECT_CHARACTER_ENCODING";
		field public static final String EXTRA_CALL_SUBJECT_MAX_LENGTH = "android.telecom.extra.CALL_SUBJECT_MAX_LENGTH";
		field public static final String EXTRA_LOG_SELF_MANAGED_CALLS = "android.telecom.extra.LOG_SELF_MANAGED_CALLS";

non-updatable-api/system-current.txt

+19 −0

Original line number	Diff line number	Diff line
		@@ -9131,6 +9131,10 @@ package android.telecom {
		method public final void addExistingConnection(@NonNull android.telecom.PhoneAccountHandle, @NonNull android.telecom.Connection, @NonNull android.telecom.Conference);
		}

		public final class DisconnectCause implements android.os.Parcelable {
		field public static final String REASON_EMULATING_SINGLE_CALL = "EMULATING_SINGLE_CALL";
		}

		public abstract class InCallService extends android.app.Service {
		method @Deprecated public android.telecom.Phone getPhone();
		method @Deprecated public void onPhoneCreated(android.telecom.Phone);
		@@ -9259,7 +9263,12 @@ 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_PLAY_CALL_RECORDING_TONE = "android.telecom.extra.PLAY_CALL_RECORDING_TONE";
		field public static final String EXTRA_SORT_ORDER = "android.telecom.extra.SORT_ORDER";
		}

		public static class PhoneAccount.Builder {
		@@ -9345,10 +9354,20 @@ 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