am c1b40c79: Merge "Add some new constants." into jb-mr2-dev (439eea83) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4410,6 +4410,14 @@ public final class Settings {
	*/		*/
	public static final String DATA_ROAMING = "data_roaming";		public static final String DATA_ROAMING = "data_roaming";

			/**
			* The value passed to a Mobile DataConnection via bringUp which defines the
			* number of retries to preform when setting up the initial connection. The default
			* value defined in DataConnectionTrackerBase#DEFAULT_MDC_INITIAL_RETRY is currently 1.
			* @hide
			*/
			public static final String MDC_INITIAL_MAX_RETRY = "mdc_initial_max_retry";

	/**		/**
	* Whether user has enabled development settings.		* Whether user has enabled development settings.
	*/		*/

telephony/java/com/android/internal/telephony/DctConstants.java

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -30,10 +30,11 @@ public class DctConstants {
	* DISCONNECTING: Connection.disconnect() has been called, but PDP		* DISCONNECTING: Connection.disconnect() has been called, but PDP
	* context is not yet deactivated		* context is not yet deactivated
	* FAILED: data connection fail for all apns settings		* FAILED: data connection fail for all apns settings
			* RETRYING: data connection failed but we're going to retry.
	*		*
	* getDataConnectionState() maps State to DataState		* getDataConnectionState() maps State to DataState
	* FAILED or IDLE : DISCONNECTED		* FAILED or IDLE : DISCONNECTED
	* CONNECTING or SCANNING: CONNECTING		* RETRYING or CONNECTING or SCANNING: CONNECTING
	* CONNECTED : CONNECTED or DISCONNECTING		* CONNECTED : CONNECTED or DISCONNECTING
	*/		*/
	public enum State {		public enum State {
	@@ -42,7 +43,8 @@ public class DctConstants {
	SCANNING,		SCANNING,
	CONNECTED,		CONNECTED,
	DISCONNECTING,		DISCONNECTING,
	FAILED		FAILED,
			RETRYING
	}		}

	public enum Activity {		public enum Activity {
	@@ -89,6 +91,8 @@ public class DctConstants {
	public static final int CMD_SET_DEPENDENCY_MET = BASE + 31;		public static final int CMD_SET_DEPENDENCY_MET = BASE + 31;
	public static final int CMD_SET_POLICY_DATA_ENABLE = BASE + 32;		public static final int CMD_SET_POLICY_DATA_ENABLE = BASE + 32;
	public static final int EVENT_ICC_CHANGED = BASE + 33;		public static final int EVENT_ICC_CHANGED = BASE + 33;
			public static final int EVENT_DISCONNECT_DC_RETRYING = BASE + 34;
			public static final int EVENT_DATA_SETUP_COMPLETE_ERROR = BASE + 35;

	/*** Constants ***/		/*** Constants ***/