Merge "Need to publish ImsReasonInfo as public API for multiple cases." am:... (6ce3af05) · Commits · e / os / android_frameworks_base

api/current.txt

+187 −0

Original line number	Diff line number	Diff line
		@@ -46038,6 +46038,193 @@ package android.telephony.gsm {

		}

		package android.telephony.ims {

		public final class ImsReasonInfo implements android.os.Parcelable {
		ctor public ImsReasonInfo(int, int, @Nullable String);
		method public int describeContents();
		method public int getCode();
		method public int getExtraCode();
		method @Nullable public String getExtraMessage();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field public static final int CODE_ACCESS_CLASS_BLOCKED = 1512; // 0x5e8
		field public static final int CODE_ANSWERED_ELSEWHERE = 1014; // 0x3f6
		field public static final int CODE_BLACKLISTED_CALL_ID = 506; // 0x1fa
		field public static final int CODE_CALL_BARRED = 240; // 0xf0
		field public static final int CODE_CALL_DROP_IWLAN_TO_LTE_UNAVAILABLE = 1100; // 0x44c
		field public static final int CODE_CALL_END_CAUSE_CALL_PULL = 1016; // 0x3f8
		field public static final int CODE_CALL_PULL_OUT_OF_SYNC = 1015; // 0x3f7
		field public static final int CODE_DATA_DISABLED = 1406; // 0x57e
		field public static final int CODE_DATA_LIMIT_REACHED = 1405; // 0x57d
		field public static final int CODE_DIAL_MODIFIED_TO_DIAL = 246; // 0xf6
		field public static final int CODE_DIAL_MODIFIED_TO_DIAL_VIDEO = 247; // 0xf7
		field public static final int CODE_DIAL_MODIFIED_TO_SS = 245; // 0xf5
		field public static final int CODE_DIAL_MODIFIED_TO_USSD = 244; // 0xf4
		field public static final int CODE_DIAL_VIDEO_MODIFIED_TO_DIAL = 248; // 0xf8
		field public static final int CODE_DIAL_VIDEO_MODIFIED_TO_DIAL_VIDEO = 249; // 0xf9
		field public static final int CODE_DIAL_VIDEO_MODIFIED_TO_SS = 250; // 0xfa
		field public static final int CODE_DIAL_VIDEO_MODIFIED_TO_USSD = 251; // 0xfb
		field public static final int CODE_ECBM_NOT_SUPPORTED = 901; // 0x385
		field public static final int CODE_EMERGENCY_PERM_FAILURE = 364; // 0x16c
		field public static final int CODE_EMERGENCY_TEMP_FAILURE = 363; // 0x16b
		field public static final int CODE_EPDG_TUNNEL_ESTABLISH_FAILURE = 1400; // 0x578
		field public static final int CODE_EPDG_TUNNEL_LOST_CONNECTION = 1402; // 0x57a
		field public static final int CODE_EPDG_TUNNEL_REKEY_FAILURE = 1401; // 0x579
		field public static final int CODE_FDN_BLOCKED = 241; // 0xf1
		field public static final int CODE_IKEV2_AUTH_FAILURE = 1408; // 0x580
		field public static final int CODE_IMEI_NOT_ACCEPTED = 243; // 0xf3
		field public static final int CODE_IWLAN_DPD_FAILURE = 1300; // 0x514
		field public static final int CODE_LOCAL_CALL_BUSY = 142; // 0x8e
		field public static final int CODE_LOCAL_CALL_CS_RETRY_REQUIRED = 146; // 0x92
		field public static final int CODE_LOCAL_CALL_DECLINE = 143; // 0x8f
		field public static final int CODE_LOCAL_CALL_EXCEEDED = 141; // 0x8d
		field public static final int CODE_LOCAL_CALL_RESOURCE_RESERVATION_FAILED = 145; // 0x91
		field public static final int CODE_LOCAL_CALL_TERMINATED = 148; // 0x94
		field public static final int CODE_LOCAL_CALL_VCC_ON_PROGRESSING = 144; // 0x90
		field public static final int CODE_LOCAL_CALL_VOLTE_RETRY_REQUIRED = 147; // 0x93
		field public static final int CODE_LOCAL_ENDED_BY_CONFERENCE_MERGE = 108; // 0x6c
		field public static final int CODE_LOCAL_HO_NOT_FEASIBLE = 149; // 0x95
		field public static final int CODE_LOCAL_ILLEGAL_ARGUMENT = 101; // 0x65
		field public static final int CODE_LOCAL_ILLEGAL_STATE = 102; // 0x66
		field public static final int CODE_LOCAL_IMS_SERVICE_DOWN = 106; // 0x6a
		field public static final int CODE_LOCAL_INTERNAL_ERROR = 103; // 0x67
		field public static final int CODE_LOCAL_LOW_BATTERY = 112; // 0x70
		field public static final int CODE_LOCAL_NETWORK_IP_CHANGED = 124; // 0x7c
		field public static final int CODE_LOCAL_NETWORK_NO_LTE_COVERAGE = 122; // 0x7a
		field public static final int CODE_LOCAL_NETWORK_NO_SERVICE = 121; // 0x79
		field public static final int CODE_LOCAL_NETWORK_ROAMING = 123; // 0x7b
		field public static final int CODE_LOCAL_NOT_REGISTERED = 132; // 0x84
		field public static final int CODE_LOCAL_NO_PENDING_CALL = 107; // 0x6b
		field public static final int CODE_LOCAL_POWER_OFF = 111; // 0x6f
		field public static final int CODE_LOCAL_SERVICE_UNAVAILABLE = 131; // 0x83
		field public static final int CODE_LOW_BATTERY = 505; // 0x1f9
		field public static final int CODE_MAXIMUM_NUMBER_OF_CALLS_REACHED = 1403; // 0x57b
		field public static final int CODE_MEDIA_INIT_FAILED = 401; // 0x191
		field public static final int CODE_MEDIA_NOT_ACCEPTABLE = 403; // 0x193
		field public static final int CODE_MEDIA_NO_DATA = 402; // 0x192
		field public static final int CODE_MEDIA_UNSPECIFIED = 404; // 0x194
		field public static final int CODE_MULTIENDPOINT_NOT_SUPPORTED = 902; // 0x386
		field public static final int CODE_NETWORK_DETACH = 1513; // 0x5e9
		field public static final int CODE_NETWORK_REJECT = 1504; // 0x5e0
		field public static final int CODE_NETWORK_RESP_TIMEOUT = 1503; // 0x5df
		field public static final int CODE_NO_CSFB_IN_CS_ROAM = 1516; // 0x5ec
		field public static final int CODE_NO_VALID_SIM = 1501; // 0x5dd
		field public static final int CODE_OEM_CAUSE_1 = 61441; // 0xf001
		field public static final int CODE_OEM_CAUSE_10 = 61450; // 0xf00a
		field public static final int CODE_OEM_CAUSE_11 = 61451; // 0xf00b
		field public static final int CODE_OEM_CAUSE_12 = 61452; // 0xf00c
		field public static final int CODE_OEM_CAUSE_13 = 61453; // 0xf00d
		field public static final int CODE_OEM_CAUSE_14 = 61454; // 0xf00e
		field public static final int CODE_OEM_CAUSE_15 = 61455; // 0xf00f
		field public static final int CODE_OEM_CAUSE_2 = 61442; // 0xf002
		field public static final int CODE_OEM_CAUSE_3 = 61443; // 0xf003
		field public static final int CODE_OEM_CAUSE_4 = 61444; // 0xf004
		field public static final int CODE_OEM_CAUSE_5 = 61445; // 0xf005
		field public static final int CODE_OEM_CAUSE_6 = 61446; // 0xf006
		field public static final int CODE_OEM_CAUSE_7 = 61447; // 0xf007
		field public static final int CODE_OEM_CAUSE_8 = 61448; // 0xf008
		field public static final int CODE_OEM_CAUSE_9 = 61449; // 0xf009
		field public static final int CODE_RADIO_ACCESS_FAILURE = 1505; // 0x5e1
		field public static final int CODE_RADIO_INTERNAL_ERROR = 1502; // 0x5de
		field public static final int CODE_RADIO_LINK_FAILURE = 1506; // 0x5e2
		field public static final int CODE_RADIO_LINK_LOST = 1507; // 0x5e3
		field public static final int CODE_RADIO_OFF = 1500; // 0x5dc
		field public static final int CODE_RADIO_RELEASE_ABNORMAL = 1511; // 0x5e7
		field public static final int CODE_RADIO_RELEASE_NORMAL = 1510; // 0x5e6
		field public static final int CODE_RADIO_SETUP_FAILURE = 1509; // 0x5e5
		field public static final int CODE_RADIO_UPLINK_FAILURE = 1508; // 0x5e4
		field public static final int CODE_REGISTRATION_ERROR = 1000; // 0x3e8
		field public static final int CODE_REJECTED_ELSEWHERE = 1017; // 0x3f9
		field public static final int CODE_REJECT_1X_COLLISION = 1603; // 0x643
		field public static final int CODE_REJECT_CALL_ON_OTHER_SUB = 1602; // 0x642
		field public static final int CODE_REJECT_CALL_TYPE_NOT_ALLOWED = 1605; // 0x645
		field public static final int CODE_REJECT_CONFERENCE_TTY_NOT_ALLOWED = 1617; // 0x651
		field public static final int CODE_REJECT_INTERNAL_ERROR = 1612; // 0x64c
		field public static final int CODE_REJECT_MAX_CALL_LIMIT_REACHED = 1608; // 0x648
		field public static final int CODE_REJECT_ONGOING_CALL_SETUP = 1607; // 0x647
		field public static final int CODE_REJECT_ONGOING_CALL_TRANSFER = 1611; // 0x64b
		field public static final int CODE_REJECT_ONGOING_CALL_UPGRADE = 1616; // 0x650
		field public static final int CODE_REJECT_ONGOING_CALL_WAITING_DISABLED = 1601; // 0x641
		field public static final int CODE_REJECT_ONGOING_CONFERENCE_CALL = 1618; // 0x652
		field public static final int CODE_REJECT_ONGOING_CS_CALL = 1621; // 0x655
		field public static final int CODE_REJECT_ONGOING_E911_CALL = 1606; // 0x646
		field public static final int CODE_REJECT_ONGOING_ENCRYPTED_CALL = 1620; // 0x654
		field public static final int CODE_REJECT_ONGOING_HANDOVER = 1614; // 0x64e
		field public static final int CODE_REJECT_QOS_FAILURE = 1613; // 0x64d
		field public static final int CODE_REJECT_SERVICE_NOT_REGISTERED = 1604; // 0x644
		field public static final int CODE_REJECT_UNKNOWN = 1600; // 0x640
		field public static final int CODE_REJECT_UNSUPPORTED_SDP_HEADERS = 1610; // 0x64a
		field public static final int CODE_REJECT_UNSUPPORTED_SIP_HEADERS = 1609; // 0x649
		field public static final int CODE_REJECT_VT_AVPF_NOT_ALLOWED = 1619; // 0x653
		field public static final int CODE_REJECT_VT_TTY_NOT_ALLOWED = 1615; // 0x64f
		field public static final int CODE_REMOTE_CALL_DECLINE = 1404; // 0x57c
		field public static final int CODE_SESSION_MODIFICATION_FAILED = 1517; // 0x5ed
		field public static final int CODE_SIP_ALTERNATE_EMERGENCY_CALL = 1514; // 0x5ea
		field public static final int CODE_SIP_AMBIGUOUS = 376; // 0x178
		field public static final int CODE_SIP_BAD_ADDRESS = 337; // 0x151
		field public static final int CODE_SIP_BAD_REQUEST = 331; // 0x14b
		field public static final int CODE_SIP_BUSY = 338; // 0x152
		field public static final int CODE_SIP_CALL_OR_TRANS_DOES_NOT_EXIST = 372; // 0x174
		field public static final int CODE_SIP_CLIENT_ERROR = 342; // 0x156
		field public static final int CODE_SIP_EXTENSION_REQUIRED = 370; // 0x172
		field public static final int CODE_SIP_FORBIDDEN = 332; // 0x14c
		field public static final int CODE_SIP_GLOBAL_ERROR = 362; // 0x16a
		field public static final int CODE_SIP_INTERVAL_TOO_BRIEF = 371; // 0x173
		field public static final int CODE_SIP_LOOP_DETECTED = 373; // 0x175
		field public static final int CODE_SIP_METHOD_NOT_ALLOWED = 366; // 0x16e
		field public static final int CODE_SIP_NOT_ACCEPTABLE = 340; // 0x154
		field public static final int CODE_SIP_NOT_FOUND = 333; // 0x14d
		field public static final int CODE_SIP_NOT_REACHABLE = 341; // 0x155
		field public static final int CODE_SIP_NOT_SUPPORTED = 334; // 0x14e
		field public static final int CODE_SIP_PROXY_AUTHENTICATION_REQUIRED = 367; // 0x16f
		field public static final int CODE_SIP_REDIRECTED = 321; // 0x141
		field public static final int CODE_SIP_REQUEST_CANCELLED = 339; // 0x153
		field public static final int CODE_SIP_REQUEST_ENTITY_TOO_LARGE = 368; // 0x170
		field public static final int CODE_SIP_REQUEST_PENDING = 377; // 0x179
		field public static final int CODE_SIP_REQUEST_TIMEOUT = 335; // 0x14f
		field public static final int CODE_SIP_REQUEST_URI_TOO_LARGE = 369; // 0x171
		field public static final int CODE_SIP_SERVER_ERROR = 354; // 0x162
		field public static final int CODE_SIP_SERVER_INTERNAL_ERROR = 351; // 0x15f
		field public static final int CODE_SIP_SERVER_TIMEOUT = 353; // 0x161
		field public static final int CODE_SIP_SERVICE_UNAVAILABLE = 352; // 0x160
		field public static final int CODE_SIP_TEMPRARILY_UNAVAILABLE = 336; // 0x150
		field public static final int CODE_SIP_TOO_MANY_HOPS = 374; // 0x176
		field public static final int CODE_SIP_TRANSACTION_DOES_NOT_EXIST = 343; // 0x157
		field public static final int CODE_SIP_UNDECIPHERABLE = 378; // 0x17a
		field public static final int CODE_SIP_USER_MARKED_UNWANTED = 365; // 0x16d
		field public static final int CODE_SIP_USER_REJECTED = 361; // 0x169
		field public static final int CODE_SUPP_SVC_CANCELLED = 1202; // 0x4b2
		field public static final int CODE_SUPP_SVC_FAILED = 1201; // 0x4b1
		field public static final int CODE_SUPP_SVC_REINVITE_COLLISION = 1203; // 0x4b3
		field public static final int CODE_TIMEOUT_1XX_WAITING = 201; // 0xc9
		field public static final int CODE_TIMEOUT_NO_ANSWER = 202; // 0xca
		field public static final int CODE_TIMEOUT_NO_ANSWER_CALL_UPDATE = 203; // 0xcb
		field public static final int CODE_UNSPECIFIED = 0; // 0x0
		field public static final int CODE_USER_CANCELLED_SESSION_MODIFICATION = 512; // 0x200
		field public static final int CODE_USER_DECLINE = 504; // 0x1f8
		field public static final int CODE_USER_IGNORE = 503; // 0x1f7
		field public static final int CODE_USER_NOANSWER = 502; // 0x1f6
		field public static final int CODE_USER_REJECTED_SESSION_MODIFICATION = 511; // 0x1ff
		field public static final int CODE_USER_TERMINATED = 501; // 0x1f5
		field public static final int CODE_USER_TERMINATED_BY_REMOTE = 510; // 0x1fe
		field public static final int CODE_UT_CB_PASSWORD_MISMATCH = 821; // 0x335
		field public static final int CODE_UT_NETWORK_ERROR = 804; // 0x324
		field public static final int CODE_UT_NOT_SUPPORTED = 801; // 0x321
		field public static final int CODE_UT_OPERATION_NOT_ALLOWED = 803; // 0x323
		field public static final int CODE_UT_SERVICE_UNAVAILABLE = 802; // 0x322
		field public static final int CODE_UT_SS_MODIFIED_TO_DIAL = 822; // 0x336
		field public static final int CODE_UT_SS_MODIFIED_TO_DIAL_VIDEO = 825; // 0x339
		field public static final int CODE_UT_SS_MODIFIED_TO_SS = 824; // 0x338
		field public static final int CODE_UT_SS_MODIFIED_TO_USSD = 823; // 0x337
		field public static final int CODE_WIFI_LOST = 1407; // 0x57f
		field @NonNull public static final android.os.Parcelable.Creator<android.telephony.ims.ImsReasonInfo> CREATOR;
		field public static final int EXTRA_CODE_CALL_RETRY_BY_SETTINGS = 3; // 0x3
		field public static final int EXTRA_CODE_CALL_RETRY_NORMAL = 1; // 0x1
		field public static final int EXTRA_CODE_CALL_RETRY_SILENT_REDIAL = 2; // 0x2
		}

		}

		package android.telephony.mbms {

		public class DownloadProgressListener {

api/system-current.txt

+0 −180

File changed.

Preview size limit exceeded, changes collapsed.

api/test-current.txt

+0 −184

File changed.

Preview size limit exceeded, changes collapsed.

telephony/java/android/telephony/ims/ImsReasonInfo.java

+25 −18

Original line number	Diff line number	Diff line
		@@ -18,9 +18,10 @@ package android.telephony.ims;

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.annotation.UnsupportedAppUsage;
		import android.os.Build;
		import android.os.Parcel;
		import android.os.Parcelable;

		@@ -28,12 +29,13 @@ import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;

		/**
		* This class enables an application to get details on why a method call failed.
		*
		* @hide
		* Provides details on why an IMS call failed. Applications can use the methods in this class to
		* get local or network fault behind an IMS services failure. For example, if the code is
		* CODE_CALL_BARRED, then the call was blocked by network call barring configuration and it is not
		* the device's bug and the user can retry the call when network lift the barring.
		* Typical use case includes call backs when IMS call state changed with this class as a param
		* containing details on why IMS call changed state/failed.
		*/
		@SystemApi
		@TestApi
		public final class ImsReasonInfo implements Parcelable {

		/**
		@@ -1096,9 +1098,11 @@ public final class ImsReasonInfo implements Parcelable {
		/**
		* Network string error messages.
		* mExtraMessage may have these values.
		* @hide
		*/
		public static final String EXTRA_MSG_SERVICE_NOT_AUTHORIZED
		= "Forbidden. Not Authorized for Service";
		@SystemApi
		public static final String EXTRA_MSG_SERVICE_NOT_AUTHORIZED =
		"Forbidden. Not Authorized for Service";


		/*
		@@ -1106,21 +1110,21 @@ public final class ImsReasonInfo implements Parcelable {
		* This value can be referred when the code is CODE_LOCAL_CALL_CS_RETRY_REQUIRED.
		*/
		/**
		* An extra that may be populated when the {@link CODE_LOCAL_CALL_CS_RETRY_REQUIRED} result has
		* An extra that may be populated when the {@link #CODE_LOCAL_CALL_CS_RETRY_REQUIRED} result has
		* been returned.
		* <p>
		* Try to connect the call using CS
		*/
		public static final int EXTRA_CODE_CALL_RETRY_NORMAL = 1;
		/**
		* An extra that may be populated when the {@link CODE_LOCAL_CALL_CS_RETRY_REQUIRED} result has
		* An extra that may be populated when the {@link #CODE_LOCAL_CALL_CS_RETRY_REQUIRED} result has
		* been returned.
		* <p>
		* Try to connect the call using CS and do not notify the user.
		*/
		public static final int EXTRA_CODE_CALL_RETRY_SILENT_REDIAL = 2;
		/**
		* An extra that may be populated when the {@link CODE_LOCAL_CALL_CS_RETRY_REQUIRED} result has
		* An extra that may be populated when the {@link #CODE_LOCAL_CALL_CS_RETRY_REQUIRED} result has
		* been returned.
		* <p>
		* Try to connect the call using CS by using the settings.
		@@ -1130,15 +1134,18 @@ public final class ImsReasonInfo implements Parcelable {

		// For main reason code
		/** @hide */
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.Q, publicAlternatives = "{@code "
		+ "#getCode()}")
		public int mCode;
		// For the extra code value; it depends on the code value.
		/** @hide */
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.Q, publicAlternatives = "{@code "
		+ "#getExtraCode()}")
		public int mExtraCode;
		// For the additional message of the reason info.
		/** @hide */
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.Q, publicAlternatives = "{@code "
		+ "#getExtraMessage()}")
		public String mExtraMessage;

		/** @hide */
		@@ -1162,7 +1169,7 @@ public final class ImsReasonInfo implements Parcelable {
		mExtraMessage = null;
		}

		public ImsReasonInfo(int code, int extraCode, String extraMessage) {
		public ImsReasonInfo(@ImsCode int code, int extraCode, @Nullable String extraMessage) {
		mCode = code;
		mExtraCode = extraCode;
		mExtraMessage = extraMessage;
		@@ -1186,7 +1193,7 @@ public final class ImsReasonInfo implements Parcelable {
		* @return an optional OEM specified string that provides extra information about the operation
		* result.
		*/
		public String getExtraMessage() {
		public @Nullable String getExtraMessage() {
		return mExtraMessage;
		}

		@@ -1205,13 +1212,13 @@ public final class ImsReasonInfo implements Parcelable {
		}

		@Override
		public void writeToParcel(Parcel out, int flags) {
		public void writeToParcel(@NonNull Parcel out, int flags) {
		out.writeInt(mCode);
		out.writeInt(mExtraCode);
		out.writeString(mExtraMessage);
		}

		public static final @android.annotation.NonNull Creator<ImsReasonInfo> CREATOR = new Creator<ImsReasonInfo>() {
		public static final @NonNull Creator<ImsReasonInfo> CREATOR = new Creator<ImsReasonInfo>() {
		@Override
		public ImsReasonInfo createFromParcel(Parcel in) {
		return new ImsReasonInfo(in);