diff options
| author | Etan Cohen <etancohen@google.com> | 2015-04-24 13:43:36 -0700 |
|---|---|---|
| committer | Etan Cohen <etancohen@google.com> | 2015-04-24 13:43:36 -0700 |
| commit | fa96c94c3046a726d558462e09ba04801d105a02 (patch) | |
| tree | 8ababdefbe32afd53788930b66cbbcc447840069 /api | |
| parent | 5a4ee7b62ecf680c4408c0cc0cccf7780bdfa0ce (diff) | |
| parent | 9561e7410b39da22c45ba3e423b1361735ccec3e (diff) | |
| download | frameworks_base-fa96c94c3046a726d558462e09ba04801d105a02.zip frameworks_base-fa96c94c3046a726d558462e09ba04801d105a02.tar.gz frameworks_base-fa96c94c3046a726d558462e09ba04801d105a02.tar.bz2 | |
Merge commit '9561e74' into merge2
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | api/system-current.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index fee81f5..ff540f3 100644 --- a/api/current.txt +++ b/api/current.txt @@ -18292,14 +18292,14 @@ package android.net { method public boolean bindProcessToNetwork(android.net.Network); method public android.net.Network getActiveNetwork(); method public android.net.NetworkInfo getActiveNetworkInfo(); - method public android.net.NetworkInfo[] getAllNetworkInfo(); + method public deprecated android.net.NetworkInfo[] getAllNetworkInfo(); method public android.net.Network[] getAllNetworks(); method public deprecated boolean getBackgroundDataSetting(); method public android.net.Network getBoundNetworkForProcess(); method public android.net.ProxyInfo getDefaultProxy(); method public android.net.LinkProperties getLinkProperties(android.net.Network); method public android.net.NetworkCapabilities getNetworkCapabilities(android.net.Network); - method public android.net.NetworkInfo getNetworkInfo(int); + method public deprecated android.net.NetworkInfo getNetworkInfo(int); method public android.net.NetworkInfo getNetworkInfo(android.net.Network); method public deprecated int getNetworkPreference(); method public static deprecated android.net.Network getProcessDefaultNetwork(); diff --git a/api/system-current.txt b/api/system-current.txt index 137bb19..41eae17 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -19751,14 +19751,14 @@ package android.net { method public boolean bindProcessToNetwork(android.net.Network); method public android.net.Network getActiveNetwork(); method public android.net.NetworkInfo getActiveNetworkInfo(); - method public android.net.NetworkInfo[] getAllNetworkInfo(); + method public deprecated android.net.NetworkInfo[] getAllNetworkInfo(); method public android.net.Network[] getAllNetworks(); method public deprecated boolean getBackgroundDataSetting(); method public android.net.Network getBoundNetworkForProcess(); method public android.net.ProxyInfo getDefaultProxy(); method public android.net.LinkProperties getLinkProperties(android.net.Network); method public android.net.NetworkCapabilities getNetworkCapabilities(android.net.Network); - method public android.net.NetworkInfo getNetworkInfo(int); + method public deprecated android.net.NetworkInfo getNetworkInfo(int); method public android.net.NetworkInfo getNetworkInfo(android.net.Network); method public deprecated int getNetworkPreference(); method public static deprecated android.net.Network getProcessDefaultNetwork(); |