diff options
| author | 2018-01-24 01:23:32 +0000 | |
|---|---|---|
| committer | 2018-01-24 01:23:32 +0000 | |
| commit | c240b8c25f214648eee17231a824d75bf293b744 (patch) | |
| tree | 3880872b7c18c9eafe1625bac7f087a70a6727ae | |
| parent | d5c9522b431e5889d4a8df2501d20fa21d08e959 (diff) | |
| parent | dae9a8e8398805c25d2796a72c28ea0cf05ccfde (diff) | |
Merge "Add TransportType in AccessNetworkConstants.java" am: afd65d9d1c
am: dae9a8e839
Change-Id: I593635999bdfa290b012313d9967bddfc5e7bfe1
| -rw-r--r-- | api/system-current.txt | 6 | ||||
| -rw-r--r-- | telephony/java/android/telephony/AccessNetworkConstants.java | 14 |
2 files changed, 20 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 98f2764858e9..c2389ae29990 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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); diff --git a/telephony/java/android/telephony/AccessNetworkConstants.java b/telephony/java/android/telephony/AccessNetworkConstants.java index fc814be1b464..703f96d0fe74 100644 --- a/telephony/java/android/telephony/AccessNetworkConstants.java +++ b/telephony/java/android/telephony/AccessNetworkConstants.java @@ -16,6 +16,8 @@ package android.telephony; +import android.annotation.SystemApi; + /** * Contains access network related constants. */ @@ -30,6 +32,18 @@ public final class AccessNetworkConstants { } /** + * 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 */ |