Merge "expose datafail cause used in telephony-sdk annotation class" (20e05a46) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -8238,6 +8238,7 @@ package android.telephony {
	field public static final int UE_SECURITY_CAPABILITIES_MISMATCH = 2185; // 0x889		field public static final int UE_SECURITY_CAPABILITIES_MISMATCH = 2185; // 0x889
	field public static final int UMTS_HANDOVER_TO_IWLAN = 2199; // 0x897		field public static final int UMTS_HANDOVER_TO_IWLAN = 2199; // 0x897
	field public static final int UMTS_REACTIVATION_REQ = 39; // 0x27		field public static final int UMTS_REACTIVATION_REQ = 39; // 0x27
			field public static final int UNACCEPTABLE_NETWORK_PARAMETER = 65538; // 0x10002
	field public static final int UNACCEPTABLE_NON_EPS_AUTHENTICATION = 2187; // 0x88b		field public static final int UNACCEPTABLE_NON_EPS_AUTHENTICATION = 2187; // 0x88b
	field public static final int UNKNOWN = 65536; // 0x10000		field public static final int UNKNOWN = 65536; // 0x10000
	field public static final int UNKNOWN_INFO_ELEMENT = 99; // 0x63		field public static final int UNKNOWN_INFO_ELEMENT = 99; // 0x63

telephony/java/android/telephony/Annotation.java

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -463,9 +463,7 @@ public class Annotation {
	DataFailCause.UNKNOWN,		DataFailCause.UNKNOWN,
	DataFailCause.RADIO_NOT_AVAILABLE,		DataFailCause.RADIO_NOT_AVAILABLE,
	DataFailCause.UNACCEPTABLE_NETWORK_PARAMETER,		DataFailCause.UNACCEPTABLE_NETWORK_PARAMETER,
	DataFailCause.CONNECTION_TO_DATACONNECTIONAC_BROKEN,
	DataFailCause.LOST_CONNECTION,		DataFailCause.LOST_CONNECTION,
	DataFailCause.RESET_BY_FRAMEWORK
	})		})
	@Retention(RetentionPolicy.SOURCE)		@Retention(RetentionPolicy.SOURCE)
	public @interface DataFailureCause {		public @interface DataFailureCause {

telephony/java/android/telephony/DataFailCause.java

+1 −8

Original line number	Original line	Diff line number	Diff line
	@@ -953,14 +953,10 @@ public final class DataFailCause {
	public static final int UNKNOWN = 0x10000;		public static final int UNKNOWN = 0x10000;
	/** Data fail due to radio not unavailable. */		/** Data fail due to radio not unavailable. */
	public static final int RADIO_NOT_AVAILABLE = 0x10001; /* no retry */		public static final int RADIO_NOT_AVAILABLE = 0x10001; /* no retry */
	/** @hide */		/** Data fail due to unacceptable network parameter. */
	public static final int UNACCEPTABLE_NETWORK_PARAMETER = 0x10002; /* no retry */		public static final int UNACCEPTABLE_NETWORK_PARAMETER = 0x10002; /* no retry */
	/** @hide */
	public static final int CONNECTION_TO_DATACONNECTIONAC_BROKEN = 0x10003;
	/** Data connection was lost. */		/** Data connection was lost. */
	public static final int LOST_CONNECTION = 0x10004;		public static final int LOST_CONNECTION = 0x10004;
	/** @hide */
	public static final int RESET_BY_FRAMEWORK = 0x10005;

	/**		/**
	* Data handover failed.		* Data handover failed.
	@@ -1364,10 +1360,7 @@ public final class DataFailCause {
	sFailCauseMap.put(RADIO_NOT_AVAILABLE, "RADIO_NOT_AVAILABLE");		sFailCauseMap.put(RADIO_NOT_AVAILABLE, "RADIO_NOT_AVAILABLE");
	sFailCauseMap.put(UNACCEPTABLE_NETWORK_PARAMETER,		sFailCauseMap.put(UNACCEPTABLE_NETWORK_PARAMETER,
	"UNACCEPTABLE_NETWORK_PARAMETER");		"UNACCEPTABLE_NETWORK_PARAMETER");
	sFailCauseMap.put(CONNECTION_TO_DATACONNECTIONAC_BROKEN,
	"CONNECTION_TO_DATACONNECTIONAC_BROKEN");
	sFailCauseMap.put(LOST_CONNECTION, "LOST_CONNECTION");		sFailCauseMap.put(LOST_CONNECTION, "LOST_CONNECTION");
	sFailCauseMap.put(RESET_BY_FRAMEWORK, "RESET_BY_FRAMEWORK");
	}		}

	private DataFailCause() {		private DataFailCause() {