Merge "Add IpClientCallbacks.onNewDhcpResults(DhcpResultsParcelable)" am: 7595e62842 am: 39458f163e

Change-Id: I9f9552dc07285916a6470978ae007cff75fb91d2

services/net/java/android/net/ip/IpClientCallbacks.java

@@ -17,6 +17,7 @@
 package android.net.ip;
 
 import android.net.DhcpResults;
+import android.net.DhcpResultsParcelable;
 import android.net.Layer2PacketParcelable;
 import android.net.LinkProperties;
 
@@ -68,6 +69,18 @@ public class IpClientCallbacks {
      */
     public void onNewDhcpResults(DhcpResults dhcpResults) {}
 
+    /**
+     * Callback called when new DHCP results are available.
+     *
+     * <p>This is purely advisory and not an indication of provisioning success or failure.  This is
+     * only here for callers that want to expose DHCPv4 results to other APIs
+     * (e.g., WifiInfo#setInetAddress).
+     *
+     * <p>DHCPv4 or static IPv4 configuration failure or success can be determined by whether or not
+     * the passed-in DhcpResults object is null.
+     */
+    public void onNewDhcpResults(DhcpResultsParcelable dhcpResults) {}
+
     /**
      * Indicates that provisioning was successful.
      */

services/net/java/android/net/ip/IpClientUtil.java

@@ -119,6 +119,7 @@ public class IpClientUtil {
         @Override
         public void onNewDhcpResults(DhcpResultsParcelable dhcpResults) {
             mCb.onNewDhcpResults(fromStableParcelable(dhcpResults));
+            mCb.onNewDhcpResults(dhcpResults);
         }
 
         @Override