diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-10-04 13:36:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-04 13:36:38 -0700 |
| commit | 16f3c140cbe3a80fff04be7c281e435ae2daa007 (patch) | |
| tree | 650fed308159157b9c0f19be37646fa69e5b7f02 /wifi | |
| parent | 97d6f18c3aec828ecc249cc4c8ab1ede81dde5bc (diff) | |
| parent | 1db7024c50abe49d8881d458b3317ccff3de1832 (diff) | |
| download | frameworks_base-16f3c140cbe3a80fff04be7c281e435ae2daa007.zip frameworks_base-16f3c140cbe3a80fff04be7c281e435ae2daa007.tar.gz frameworks_base-16f3c140cbe3a80fff04be7c281e435ae2daa007.tar.bz2 | |
am 1db7024c: am 2e23484e: am f3f1a370: Merge "Un-deprecate getDhcpInfo" into klp-dev
* commit '1db7024c50abe49d8881d458b3317ccff3de1832':
Un-deprecate getDhcpInfo
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index b7594ee..7fc8bef 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -988,7 +988,6 @@ public class WifiManager { * Return the DHCP-assigned addresses from the last successful DHCP request, * if any. * @return the DHCP information - * @deprecated - use ConnectivityManager.getLinkProperties instead. TODO - remove 11/2013 */ public DhcpInfo getDhcpInfo() { try { |