Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f76b5383 authored Oct 03, 2013 by Robert Greenwalt

DO NOT MERGE Un-deprecate getDhcpInfo

Replacement api isn't available.

bug:10003785
Change-Id: I0c91716d9aae61dc1db4d015a78b729157ea99a9

parent 49eb1d95

api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -13104,7 +13104,7 @@ package android.net {
		method public int getUid();
		}

		public deprecated class DhcpInfo implements android.os.Parcelable {
		public class DhcpInfo implements android.os.Parcelable {
		ctor public DhcpInfo();
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		@@ -14012,7 +14012,7 @@ package android.net.wifi {
		method public boolean enableNetwork(int, boolean);
		method public java.util.List<android.net.wifi.WifiConfiguration> getConfiguredNetworks();
		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 int getWifiState();
		method public boolean isScanAlwaysAvailable();

core/java/android/net/DhcpInfo.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import java.net.InetAddress;

		/**
		* 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 int ipAddress;

wifi/java/android/net/wifi/WifiManager.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -884,7 +884,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 {