diff options
| author | Paul Jensen <pauljensen@google.com> | 2015-06-23 19:40:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-23 19:40:02 +0000 |
| commit | dafd561298c4162dd6d95a22334e4cd3988a8f84 (patch) | |
| tree | e3218bc6183c3157216be985330a726fad7b3a6d /api/current.txt | |
| parent | a6fb1e70ffa4faeba725b06610f4daa1ee60ead8 (diff) | |
| parent | 3d194eae6f658ed865b2d3b748f8b83834c877ab (diff) | |
| download | frameworks_base-dafd561298c4162dd6d95a22334e4cd3988a8f84.zip frameworks_base-dafd561298c4162dd6d95a22334e4cd3988a8f84.tar.gz frameworks_base-dafd561298c4162dd6d95a22334e4cd3988a8f84.tar.bz2 | |
Merge "Add NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL" into mnc-dev
Diffstat (limited to 'api/current.txt')
| -rw-r--r-- | api/current.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 340493e..2058ac9 100644 --- a/api/current.txt +++ b/api/current.txt @@ -18350,6 +18350,7 @@ package android.net { method public boolean hasTransport(int); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.net.NetworkCapabilities> CREATOR; + field public static final int NET_CAPABILITY_CAPTIVE_PORTAL = 17; // 0x11 field public static final int NET_CAPABILITY_CBS = 5; // 0x5 field public static final int NET_CAPABILITY_DUN = 2; // 0x2 field public static final int NET_CAPABILITY_EIMS = 10; // 0xa |