From dd8e315b86614627eb8ba629c713d73034fed357 Mon Sep 17 00:00:00 2001
From: Robert Greenwalt <rgreenwalt@google.com>
Date: Thu, 3 Oct 2013 16:59:05 -0700
Subject: DO NOT MERGE Un-deprecate getDhcpInfo

Replacement api isn't available.

bug:10003785
Change-Id: I0c91716d9aae61dc1db4d015a78b729157ea99a9
---
 api/current.txt                             | 4 ++--
 core/java/android/net/DhcpInfo.java         | 1 -
 wifi/java/android/net/wifi/WifiManager.java | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 02b95a0fc10b..bcab0ffdb3c3 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -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();
diff --git a/core/java/android/net/DhcpInfo.java b/core/java/android/net/DhcpInfo.java
index ab4cd9b9ef76..3bede5da5090 100644
--- a/core/java/android/net/DhcpInfo.java
+++ b/core/java/android/net/DhcpInfo.java
@@ -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;
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index a3c172adad3a..8d7ecac3d22a 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -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 {
-- 
cgit v1.2.3-59-g8ed1b