Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE Un-deprecate getDhcpInfo

Browse Source 
Replacement api isn't available.

bug:10003785
Change-Id: I0c91716d9aae61dc1db4d015a78b729157ea99a9
This commit is contained in:
Robert Greenwalt
2013-10-03 16:59:05 -07:00
parent f5468f6d42
commit dd8e315b86
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -13104,7 +13104,7 @@ package android.net {
method public int getUid(); method public int getUid();
} }
public deprecated class DhcpInfo implements android.os.Parcelable { public class DhcpInfo implements android.os.Parcelable {
ctor public DhcpInfo(); ctor public DhcpInfo();
method public int describeContents(); method public int describeContents();
method public void writeToParcel(android.os.Parcel, int); method public void writeToParcel(android.os.Parcel, int);
@@ -14012,7 +14012,7 @@ package android.net.wifi {
method public boolean enableNetwork(int, boolean); method public boolean enableNetwork(int, boolean);
method public java.util.List<android.net.wifi.WifiConfiguration> getConfiguredNetworks(); method public java.util.List<android.net.wifi.WifiConfiguration> getConfiguredNetworks();
method public android.net.wifi.WifiInfo getConnectionInfo(); method public android.net.wifi.WifiInfo getConnectionInfo();
method public deprecated android.net.DhcpInfo getDhcpInfo(); method public android.net.DhcpInfo getDhcpInfo();
method public java.util.List<android.net.wifi.ScanResult> getScanResults(); method public java.util.List<android.net.wifi.ScanResult> getScanResults();
method public int getWifiState(); method public int getWifiState();
method public boolean isScanAlwaysAvailable(); method public boolean isScanAlwaysAvailable();

1
core/java/android/net/DhcpInfo.java
View File

@@ -22,7 +22,6 @@ import java.net.InetAddress;
/** /**
* A simple object for retrieving the results of a DHCP request. * A simple object for retrieving the results of a DHCP request.
* @deprecated - use LinkProperties - To be removed 11/2014
*/ */
public class DhcpInfo implements Parcelable { public class DhcpInfo implements Parcelable {
public int ipAddress; public int ipAddress;

1
wifi/java/android/net/wifi/WifiManager.java
View File

@@ -884,7 +884,6 @@ public class WifiManager {
* Return the DHCP-assigned addresses from the last successful DHCP request, * Return the DHCP-assigned addresses from the last successful DHCP request,
* if any. * if any.
* @return the DHCP information * @return the DHCP information
* @deprecated - use ConnectivityManager.getLinkProperties instead. TODO - remove 11/2013
*/ */
public DhcpInfo getDhcpInfo() { public DhcpInfo getDhcpInfo() {
try { try {