Merge "Add TransportType in AccessNetworkConstants.java" (dae9a8e8) · Commits · e / os / android_frameworks_base

api/system-current.txt

+6 −0

Original line number	Diff line number	Diff line
		@@ -3946,6 +3946,12 @@ package android.telecom {

		package android.telephony {

		public static final class AccessNetworkConstants.TransportType {
		ctor public AccessNetworkConstants.TransportType();
		field public static final int WLAN = 2; // 0x2
		field public static final int WWAN = 1; // 0x1
		}

		public class CarrierConfigManager {
		method public static android.os.PersistableBundle getDefaultConfig();
		method public void updateConfigForPhoneId(int, java.lang.String);

+14 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package android.telephony;

		import android.annotation.SystemApi;

		/**
		* Contains access network related constants.
		*/
		@@ -29,6 +31,18 @@ public final class AccessNetworkConstants {
		public static final int IWLAN = 5;
		}

		/**
		* Wireless transportation type
		* @hide
		*/
		@SystemApi
		public static final class TransportType {
		/** Wireless Wide Area Networks (i.e. Cellular) */
		public static final int WWAN = 1;
		/** Wireless Local Area Networks (i.e. Wifi) */
		public static final int WLAN = 2;
		}

		/**
		* Frenquency bands for GERAN.
		* http://www.etsi.org/deliver/etsi_ts/145000_145099/145005/14.00.00_60/ts_145005v140000p.pdf