Merge "Rename RadioNetworkConstants to NetworkConstants." (289b3fbc) · Commits · e / os / android_frameworks_base

api/current.txt

+107 −105

Original line number	Diff line number	Diff line
		@@ -39833,6 +39833,113 @@ package android.telecom {

		package android.telephony {

		public final class AccessNetworkConstants {
		ctor public AccessNetworkConstants();
		}

		public static final class AccessNetworkConstants.AccessNetworkType {
		ctor public AccessNetworkConstants.AccessNetworkType();
		field public static final int CDMA2000 = 4; // 0x4
		field public static final int EUTRAN = 3; // 0x3
		field public static final int GERAN = 1; // 0x1
		field public static final int IWLAN = 5; // 0x5
		field public static final int UTRAN = 2; // 0x2
		}

		public static final class AccessNetworkConstants.EutranBand {
		ctor public AccessNetworkConstants.EutranBand();
		field public static final int BAND_1 = 1; // 0x1
		field public static final int BAND_10 = 10; // 0xa
		field public static final int BAND_11 = 11; // 0xb
		field public static final int BAND_12 = 12; // 0xc
		field public static final int BAND_13 = 13; // 0xd
		field public static final int BAND_14 = 14; // 0xe
		field public static final int BAND_17 = 17; // 0x11
		field public static final int BAND_18 = 18; // 0x12
		field public static final int BAND_19 = 19; // 0x13
		field public static final int BAND_2 = 2; // 0x2
		field public static final int BAND_20 = 20; // 0x14
		field public static final int BAND_21 = 21; // 0x15
		field public static final int BAND_22 = 22; // 0x16
		field public static final int BAND_23 = 23; // 0x17
		field public static final int BAND_24 = 24; // 0x18
		field public static final int BAND_25 = 25; // 0x19
		field public static final int BAND_26 = 26; // 0x1a
		field public static final int BAND_27 = 27; // 0x1b
		field public static final int BAND_28 = 28; // 0x1c
		field public static final int BAND_3 = 3; // 0x3
		field public static final int BAND_30 = 30; // 0x1e
		field public static final int BAND_31 = 31; // 0x1f
		field public static final int BAND_33 = 33; // 0x21
		field public static final int BAND_34 = 34; // 0x22
		field public static final int BAND_35 = 35; // 0x23
		field public static final int BAND_36 = 36; // 0x24
		field public static final int BAND_37 = 37; // 0x25
		field public static final int BAND_38 = 38; // 0x26
		field public static final int BAND_39 = 39; // 0x27
		field public static final int BAND_4 = 4; // 0x4
		field public static final int BAND_40 = 40; // 0x28
		field public static final int BAND_41 = 41; // 0x29
		field public static final int BAND_42 = 42; // 0x2a
		field public static final int BAND_43 = 43; // 0x2b
		field public static final int BAND_44 = 44; // 0x2c
		field public static final int BAND_45 = 45; // 0x2d
		field public static final int BAND_46 = 46; // 0x2e
		field public static final int BAND_47 = 47; // 0x2f
		field public static final int BAND_48 = 48; // 0x30
		field public static final int BAND_5 = 5; // 0x5
		field public static final int BAND_6 = 6; // 0x6
		field public static final int BAND_65 = 65; // 0x41
		field public static final int BAND_66 = 66; // 0x42
		field public static final int BAND_68 = 68; // 0x44
		field public static final int BAND_7 = 7; // 0x7
		field public static final int BAND_70 = 70; // 0x46
		field public static final int BAND_8 = 8; // 0x8
		field public static final int BAND_9 = 9; // 0x9
		}

		public static final class AccessNetworkConstants.GeranBand {
		ctor public AccessNetworkConstants.GeranBand();
		field public static final int BAND_450 = 3; // 0x3
		field public static final int BAND_480 = 4; // 0x4
		field public static final int BAND_710 = 5; // 0x5
		field public static final int BAND_750 = 6; // 0x6
		field public static final int BAND_850 = 8; // 0x8
		field public static final int BAND_DCS1800 = 12; // 0xc
		field public static final int BAND_E900 = 10; // 0xa
		field public static final int BAND_ER900 = 14; // 0xe
		field public static final int BAND_P900 = 9; // 0x9
		field public static final int BAND_PCS1900 = 13; // 0xd
		field public static final int BAND_R900 = 11; // 0xb
		field public static final int BAND_T380 = 1; // 0x1
		field public static final int BAND_T410 = 2; // 0x2
		field public static final int BAND_T810 = 7; // 0x7
		}

		public static final class AccessNetworkConstants.UtranBand {
		ctor public AccessNetworkConstants.UtranBand();
		field public static final int BAND_1 = 1; // 0x1
		field public static final int BAND_10 = 10; // 0xa
		field public static final int BAND_11 = 11; // 0xb
		field public static final int BAND_12 = 12; // 0xc
		field public static final int BAND_13 = 13; // 0xd
		field public static final int BAND_14 = 14; // 0xe
		field public static final int BAND_19 = 19; // 0x13
		field public static final int BAND_2 = 2; // 0x2
		field public static final int BAND_20 = 20; // 0x14
		field public static final int BAND_21 = 21; // 0x15
		field public static final int BAND_22 = 22; // 0x16
		field public static final int BAND_25 = 25; // 0x19
		field public static final int BAND_26 = 26; // 0x1a
		field public static final int BAND_3 = 3; // 0x3
		field public static final int BAND_4 = 4; // 0x4
		field public static final int BAND_5 = 5; // 0x5
		field public static final int BAND_6 = 6; // 0x6
		field public static final int BAND_7 = 7; // 0x7
		field public static final int BAND_8 = 8; // 0x8
		field public static final int BAND_9 = 9; // 0x9
		}

		public class CarrierConfigManager {
		method public android.os.PersistableBundle getConfig();
		method public android.os.PersistableBundle getConfigForSubId(int);
		@@ -40354,111 +40461,6 @@ package android.telephony {
		field public static final android.os.Parcelable.Creator<android.telephony.RadioAccessSpecifier> CREATOR;
		}

		public final class RadioNetworkConstants {
		ctor public RadioNetworkConstants();
		}

		public static final class RadioNetworkConstants.EutranBands {
		ctor public RadioNetworkConstants.EutranBands();
		field public static final int BAND_1 = 1; // 0x1
		field public static final int BAND_10 = 10; // 0xa
		field public static final int BAND_11 = 11; // 0xb
		field public static final int BAND_12 = 12; // 0xc
		field public static final int BAND_13 = 13; // 0xd
		field public static final int BAND_14 = 14; // 0xe
		field public static final int BAND_17 = 17; // 0x11
		field public static final int BAND_18 = 18; // 0x12
		field public static final int BAND_19 = 19; // 0x13
		field public static final int BAND_2 = 2; // 0x2
		field public static final int BAND_20 = 20; // 0x14
		field public static final int BAND_21 = 21; // 0x15
		field public static final int BAND_22 = 22; // 0x16
		field public static final int BAND_23 = 23; // 0x17
		field public static final int BAND_24 = 24; // 0x18
		field public static final int BAND_25 = 25; // 0x19
		field public static final int BAND_26 = 26; // 0x1a
		field public static final int BAND_27 = 27; // 0x1b
		field public static final int BAND_28 = 28; // 0x1c
		field public static final int BAND_3 = 3; // 0x3
		field public static final int BAND_30 = 30; // 0x1e
		field public static final int BAND_31 = 31; // 0x1f
		field public static final int BAND_33 = 33; // 0x21
		field public static final int BAND_34 = 34; // 0x22
		field public static final int BAND_35 = 35; // 0x23
		field public static final int BAND_36 = 36; // 0x24
		field public static final int BAND_37 = 37; // 0x25
		field public static final int BAND_38 = 38; // 0x26
		field public static final int BAND_39 = 39; // 0x27
		field public static final int BAND_4 = 4; // 0x4
		field public static final int BAND_40 = 40; // 0x28
		field public static final int BAND_41 = 41; // 0x29
		field public static final int BAND_42 = 42; // 0x2a
		field public static final int BAND_43 = 43; // 0x2b
		field public static final int BAND_44 = 44; // 0x2c
		field public static final int BAND_45 = 45; // 0x2d
		field public static final int BAND_46 = 46; // 0x2e
		field public static final int BAND_47 = 47; // 0x2f
		field public static final int BAND_48 = 48; // 0x30
		field public static final int BAND_5 = 5; // 0x5
		field public static final int BAND_6 = 6; // 0x6
		field public static final int BAND_65 = 65; // 0x41
		field public static final int BAND_66 = 66; // 0x42
		field public static final int BAND_68 = 68; // 0x44
		field public static final int BAND_7 = 7; // 0x7
		field public static final int BAND_70 = 70; // 0x46
		field public static final int BAND_8 = 8; // 0x8
		field public static final int BAND_9 = 9; // 0x9
		}

		public static final class RadioNetworkConstants.GeranBands {
		ctor public RadioNetworkConstants.GeranBands();
		field public static final int BAND_450 = 3; // 0x3
		field public static final int BAND_480 = 4; // 0x4
		field public static final int BAND_710 = 5; // 0x5
		field public static final int BAND_750 = 6; // 0x6
		field public static final int BAND_850 = 8; // 0x8
		field public static final int BAND_DCS1800 = 12; // 0xc
		field public static final int BAND_E900 = 10; // 0xa
		field public static final int BAND_ER900 = 14; // 0xe
		field public static final int BAND_P900 = 9; // 0x9
		field public static final int BAND_PCS1900 = 13; // 0xd
		field public static final int BAND_R900 = 11; // 0xb
		field public static final int BAND_T380 = 1; // 0x1
		field public static final int BAND_T410 = 2; // 0x2
		field public static final int BAND_T810 = 7; // 0x7
		}

		public static final class RadioNetworkConstants.RadioAccessNetworks {
		ctor public RadioNetworkConstants.RadioAccessNetworks();
		field public static final int EUTRAN = 3; // 0x3
		field public static final int GERAN = 1; // 0x1
		field public static final int UTRAN = 2; // 0x2
		}

		public static final class RadioNetworkConstants.UtranBands {
		ctor public RadioNetworkConstants.UtranBands();
		field public static final int BAND_1 = 1; // 0x1
		field public static final int BAND_10 = 10; // 0xa
		field public static final int BAND_11 = 11; // 0xb
		field public static final int BAND_12 = 12; // 0xc
		field public static final int BAND_13 = 13; // 0xd
		field public static final int BAND_14 = 14; // 0xe
		field public static final int BAND_19 = 19; // 0x13
		field public static final int BAND_2 = 2; // 0x2
		field public static final int BAND_20 = 20; // 0x14
		field public static final int BAND_21 = 21; // 0x15
		field public static final int BAND_22 = 22; // 0x16
		field public static final int BAND_25 = 25; // 0x19
		field public static final int BAND_26 = 26; // 0x1a
		field public static final int BAND_3 = 3; // 0x3
		field public static final int BAND_4 = 4; // 0x4
		field public static final int BAND_5 = 5; // 0x5
		field public static final int BAND_6 = 6; // 0x6
		field public static final int BAND_7 = 7; // 0x7
		field public static final int BAND_8 = 8; // 0x8
		field public static final int BAND_9 = 9; // 0x9
		}

		public class ServiceState implements android.os.Parcelable {
		ctor public ServiceState();
		ctor public ServiceState(android.telephony.ServiceState);

telephony/java/android/telephony/RadioNetworkConstants.java→telephony/java/android/telephony/AccessNetworkConstants.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -17,23 +17,23 @@
		package android.telephony;

		/**
		* Contains radio access network related constants.
		* Contains access network related constants.
		*/
		public final class RadioNetworkConstants {
		public final class AccessNetworkConstants {

		public static final class RadioAccessNetworks {
		public static final class AccessNetworkType {
		public static final int GERAN = 1;
		public static final int UTRAN = 2;
		public static final int EUTRAN = 3;
		/** @hide */
		public static final int CDMA2000 = 4;
		public static final int IWLAN = 5;
		}

		/**
		* Frenquency bands for GERAN.
		* http://www.etsi.org/deliver/etsi_ts/145000_145099/145005/14.00.00_60/ts_145005v140000p.pdf
		*/
		public static final class GeranBands {
		public static final class GeranBand {
		public static final int BAND_T380 = 1;
		public static final int BAND_T410 = 2;
		public static final int BAND_450 = 3;
		@@ -54,7 +54,7 @@ public final class RadioNetworkConstants {
		* Frenquency bands for UTRAN.
		* http://www.etsi.org/deliver/etsi_ts/125100_125199/125104/13.03.00_60/ts_125104v130p.pdf
		*/
		public static final class UtranBands {
		public static final class UtranBand {
		public static final int BAND_1 = 1;
		public static final int BAND_2 = 2;
		public static final int BAND_3 = 3;
		@@ -83,7 +83,7 @@ public final class RadioNetworkConstants {
		* Frenquency bands for EUTRAN.
		* http://www.etsi.org/deliver/etsi_ts/136100_136199/136101/14.03.00_60/ts_136101v140p.pdf
		*/
		public static final class EutranBands {
		public static final class EutranBand {
		public static final int BAND_1 = 1;
		public static final int BAND_2 = 2;
		public static final int BAND_3 = 3;

telephony/java/android/telephony/RadioAccessSpecifier.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ public final class RadioAccessSpecifier implements Parcelable {
		*
		* This parameter must be provided or else the scan will be rejected.
		*
		* See {@link RadioNetworkConstants.RadioAccessNetworks} for details.
		* See {@link AccessNetworkConstants.AccessNetworkType} for details.
		*/
		private int mRadioAccessNetwork;

		@@ -43,7 +43,7 @@ public final class RadioAccessSpecifier implements Parcelable {
		* When no specific bands are specified (empty array or null), all the frequency bands
		* supported by the modem will be scanned.
		*
		* See {@link RadioNetworkConstants} for details.
		* See {@link AccessNetworkConstants} for details.
		*/
		private int[] mBands;

		@@ -56,7 +56,7 @@ public final class RadioAccessSpecifier implements Parcelable {
		* When no specific channels are specified (empty array or null), all the frequency channels
		* supported by the modem will be scanned.
		*
		* See {@link RadioNetworkConstants} for details.
		* See {@link AccessNetworkConstants} for details.
		*/
		private int[] mChannels;

		@@ -79,7 +79,7 @@ public final class RadioAccessSpecifier implements Parcelable {
		/**
		* Returns the radio access network that needs to be scanned.
		*
		* The returned value is define in {@link RadioNetworkConstants.RadioAccessNetworks};
		* The returned value is define in {@link AccessNetworkConstants.AccessNetworkType};
		*/
		public int getRadioAccessNetwork() {
		return mRadioAccessNetwork;
		@@ -88,8 +88,8 @@ public final class RadioAccessSpecifier implements Parcelable {
		/**
		* Returns the frequency bands that need to be scanned.
		*
		* The returned value is defined in either of {@link RadioNetworkConstants.GeranBands},
		* {@link RadioNetworkConstants.UtranBands} and {@link RadioNetworkConstants.EutranBands}, and
		* The returned value is defined in either of {@link AccessNetworkConstants.GeranBand},
		* {@link AccessNetworkConstants.UtranBand} and {@link AccessNetworkConstants.EutranBand}, and
		* it depends on the returned value of {@link #getRadioAccessNetwork()}.
		*/
		public int[] getBands() {