Merge "Revert "Change averagingWindowMs to int"" (4f2132e3) · Commits · e / os / android_hardware_interfaces

radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/ApnAuthType.aidl

+4 −4

Original line number	Diff line number	Diff line
		@@ -34,8 +34,8 @@
		package android.hardware.radio.data;
		@Backing(type="int") @JavaDerive(toString=true) @VintfStability
		enum ApnAuthType {
		NO_PAP_NO_CHAP,
		PAP_NO_CHAP,
		NO_PAP_CHAP,
		PAP_CHAP,
		NO_PAP_NO_CHAP = 0,
		PAP_NO_CHAP = 1,
		NO_PAP_CHAP = 2,
		PAP_CHAP = 3,
		}

+15 −15

Original line number	Diff line number	Diff line
		@@ -35,19 +35,19 @@ package android.hardware.radio.data;
		@Backing(type="int") @JavaDerive(toString=true) @VintfStability
		enum ApnTypes {
		NONE = 0,
		DEFAULT = (1 << 0),
		MMS = (1 << 1),
		SUPL = (1 << 2),
		DUN = (1 << 3),
		HIPRI = (1 << 4),
		FOTA = (1 << 5),
		IMS = (1 << 6),
		CBS = (1 << 7),
		IA = (1 << 8),
		EMERGENCY = (1 << 9),
		MCX = (1 << 10),
		XCAP = (1 << 11),
		VSIM = (1 << 12),
		BIP = (1 << 13),
		ENTERPRISE = (1 << 14),
		DEFAULT = 1,
		MMS = 2,
		SUPL = 4,
		DUN = 8,
		HIPRI = 16,
		FOTA = 32,
		IMS = 64,
		CBS = 128,
		IA = 256,
		EMERGENCY = 512,
		MCX = 1024,
		XCAP = 2048,
		VSIM = 4096,
		BIP = 8192,
		ENTERPRISE = 16384,
		}

+339 −339

File changed.

Preview size limit exceeded, changes collapsed.

+1 −1

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ parcelable DataProfileInfo {
		const int ID_FOTA = 3;
		const int ID_CBS = 4;
		const int ID_OEM_BASE = 1000;
		const int ID_INVALID = 0xFFFFFFFF;
		const int ID_INVALID = -1;
		const int TYPE_COMMON = 0;
		const int TYPE_3GPP = 1;
		const int TYPE_3GPP2 = 2;

+4 −4

Original line number	Diff line number	Diff line
		@@ -34,8 +34,8 @@
		package android.hardware.radio.data;
		@Backing(type="byte") @JavaDerive(toString=true) @VintfStability
		enum DataThrottlingAction {
		NO_DATA_THROTTLING,
		THROTTLE_SECONDARY_CARRIER,
		THROTTLE_ANCHOR_CARRIER,
		HOLD,
		NO_DATA_THROTTLING = 0,
		THROTTLE_SECONDARY_CARRIER = 1,
		THROTTLE_ANCHOR_CARRIER = 2,
		HOLD = 3,
		}