diff options
| -rw-r--r-- | services/net/java/android/net/ip/IpClient.java | 5 | ||||
| -rw-r--r-- | 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 b305b336d12f..fdb366c55a7b 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) { @@ -1283,7 +1283,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 ebf121ae304a..22d88fb70697 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; } |