diff options
| author | Paul Jensen <pauljensen@google.com> | 2015-06-16 14:27:36 -0400 |
|---|---|---|
| committer | Paul Jensen <pauljensen@google.com> | 2015-06-23 14:09:01 -0400 |
| commit | 3d194eae6f658ed865b2d3b748f8b83834c877ab (patch) | |
| tree | d955a704ffe177ab39e301d5fd97e1a7ea2a34c2 /api | |
| parent | 5ac88a3987f70cfa9a2713c6d2000be141ea22d2 (diff) | |
| download | frameworks_base-3d194eae6f658ed865b2d3b748f8b83834c877ab.zip frameworks_base-3d194eae6f658ed865b2d3b748f8b83834c877ab.tar.gz frameworks_base-3d194eae6f658ed865b2d3b748f8b83834c877ab.tar.bz2 | |
Add NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL
Bug: 21343774
Bug: 20898908
Change-Id: I23069a6cba346999d1b2eeaa445023bd6bf4ef94
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index a538d86..6e5c25f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -18357,6 +18357,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 diff --git a/api/system-current.txt b/api/system-current.txt index 57581e2..baf1ee2 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -19858,6 +19858,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 |