diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-06-23 14:41:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-23 14:41:57 +0000 |
| commit | e2d921da29e8ef556784178f2a30fad80258d034 (patch) | |
| tree | 480c8233cefd9d32d96ec05ab51d1cad40890007 /api/system-current.txt | |
| parent | 805fc82ea9c12aba53af4ebda6ea3f8a349201ac (diff) | |
| parent | 662761224c93cf060a356284101354031cb80dc2 (diff) | |
| download | frameworks_base-e2d921da29e8ef556784178f2a30fad80258d034.zip frameworks_base-e2d921da29e8ef556784178f2a30fad80258d034.tar.gz frameworks_base-e2d921da29e8ef556784178f2a30fad80258d034.tar.bz2 | |
Merge "Re-hide onPreCheck and unhide NET_CAPABILITY_VALIDATED." into mnc-dev
Diffstat (limited to 'api/system-current.txt')
| -rw-r--r-- | api/system-current.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index bb0c7f3..57581e2 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -19708,7 +19708,6 @@ package android.net { method public void onLinkPropertiesChanged(android.net.Network, android.net.LinkProperties); method public void onLosing(android.net.Network, int); method public void onLost(android.net.Network); - method public void onPreCheck(android.net.Network); } public static abstract interface ConnectivityManager.OnNetworkActiveListener { @@ -19873,6 +19872,7 @@ package android.net { field public static final int NET_CAPABILITY_RCS = 8; // 0x8 field public static final int NET_CAPABILITY_SUPL = 1; // 0x1 field public static final int NET_CAPABILITY_TRUSTED = 14; // 0xe + field public static final int NET_CAPABILITY_VALIDATED = 16; // 0x10 field public static final int NET_CAPABILITY_WIFI_P2P = 6; // 0x6 field public static final int NET_CAPABILITY_XCAP = 9; // 0x9 field public static final int TRANSPORT_BLUETOOTH = 2; // 0x2 |