pass a defensive copy of DhcpResults

Also: correct state transition handling in DhcpBoundState#enter().

Bug: 20451261
Change-Id: I3be50f6b1b3fae179d6fff7ca8ae1d687caa3221

1 files changed, 7 insertions, 6 deletions

diff --git a/services/net/java/android/net/dhcp/DhcpClient.java b/services/net/java/android/net/dhcp/DhcpClient.java
index 316496f..2692d71 100644
--- a/services/net/java/android/net/dhcp/DhcpClient.java
+++ b/services/net/java/android/net/dhcp/DhcpClient.java
@@ -400,7 +400,7 @@ public class DhcpClient extends BaseDhcpStateMachine {
 
     private void notifyLease() {
         mController.sendMessage(DhcpStateMachine.CMD_POST_DHCP_ACTION,
-                DhcpStateMachine.DHCP_SUCCESS, 0, mDhcpLease);
+                DhcpStateMachine.DHCP_SUCCESS, 0, new DhcpResults(mDhcpLease));
     }
 
     private void notifyFailure() {
@@ -747,14 +747,15 @@ public class DhcpClient extends BaseDhcpStateMachine {
         @Override
         public void enter() {
             super.enter();
-            if (!setIpAddress(mDhcpLease.ipAddress)) {
+            if (setIpAddress(mDhcpLease.ipAddress)) {
+                notifyLease();
+                // TODO: DhcpStateMachine only supports renewing at 50% of the lease time,
+                // and does not support rebinding. Fix this.
+                scheduleRenew();
+            } else {
                 notifyFailure();
                 transitionTo(mStoppedState);
             }
-            notifyLease();
-            // TODO: DhcpStateMachine only supports renewing at 50% of the lease time, and does not
-            // support rebinding. Fix this.
-            scheduleRenew();
         }
 
         @Override