From f1967c4125f1f08f9ee4a45d68413a1c3a0e7d72 Mon Sep 17 00:00:00 2001
From: Roshan Pius <rpius@google.com>
Date: Fri, 8 Dec 2017 22:29:50 +0000
Subject: [PATCH] Revert "Send empty LinkProperties when entering
 StoppedState."

This reverts commit b3f9f4a30502477e71fc93037dc58080fddb1853.

Reason for revert: Crash in WifiStateMachine (b/70394432)

Change-Id: I3a96c822eddcebcdd6621cee878b865171d094e8
---
 services/net/java/android/net/ip/IpClient.java   | 5 ++---
 tests/net/java/android/net/ip/IpManagerTest.java | 6 ------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/services/net/java/android/net/ip/IpClient.java b/services/net/java/android/net/ip/IpClient.java
index 5c58cdb6462b6..70983c864ffcf 100644
--- a/services/net/java/android/net/ip/IpClient.java
+++ b/services/net/java/android/net/ip/IpClient.java
@@ -163,10 +163,10 @@ public class IpClient extends StateMachine {
     // TODO: Find an lighter weight approach.
     private class LoggingCallbackWrapper extends Callback {
         private static final String PREFIX = "INVOKE ";
-        private final Callback mCallback;
+        private Callback mCallback;
 
         public LoggingCallbackWrapper(Callback callback) {
-            mCallback = (callback != null) ? callback : new Callback();
+            mCallback = callback;
         }
 
         private void log(String msg) {
@@ -1273,7 +1273,6 @@ public class IpClient extends StateMachine {
             stopAllIP();
 
             resetLinkProperties();
-            mCallback.onLinkPropertiesChange(new LinkProperties(mLinkProperties));
             if (mStartTimeMillis > 0) {
                 recordMetric(IpManagerEvent.COMPLETE_LIFECYCLE);
                 mStartTimeMillis = 0;
diff --git a/tests/net/java/android/net/ip/IpManagerTest.java b/tests/net/java/android/net/ip/IpManagerTest.java
index ebf121ae304a0..22d88fb706972 100644
--- a/tests/net/java/android/net/ip/IpManagerTest.java
+++ b/tests/net/java/android/net/ip/IpManagerTest.java
@@ -69,8 +69,6 @@ import java.util.Set;
 
 /**
  * Tests for IpManager.
- *
- * TODO: Rename to IpClientTest.
  */
 @RunWith(AndroidJUnit4.class)
 @SmallTest
@@ -113,10 +111,6 @@ public class IpManagerTest {
         verify(mNMService, times(1)).registerObserver(arg.capture());
         mObserver = arg.getValue();
         reset(mNMService);
-        final LinkProperties emptyLp = new LinkProperties();
-        emptyLp.setInterfaceName(ifname);
-        verify(mCb, timeout(100)).onLinkPropertiesChange(eq(emptyLp));
-        reset(mCb);
         return ipm;
     }