Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Send empty LinkProperties when entering StoppedState."

Browse Source
This commit is contained in:
Treehugger Robot
2017-12-08 03:14:09 +00:00
committed by Gerrit Code Review
parent 6a4be8613a b3f9f4a305
commit efdca004ab
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/net/java/android/net/ip/IpClient.java
View File

@@ -163,10 +163,10 @@ public class IpClient extends StateMachine {
// TODO: Find an lighter weight approach. // TODO: Find an lighter weight approach.
private class LoggingCallbackWrapper extends Callback { private class LoggingCallbackWrapper extends Callback {
private static final String PREFIX = "INVOKE "; private static final String PREFIX = "INVOKE ";
private Callback mCallback; private final Callback mCallback;
public LoggingCallbackWrapper(Callback callback) { public LoggingCallbackWrapper(Callback callback) {
mCallback = callback; mCallback = (callback != null) ? callback : new Callback();
} }
private void log(String msg) { private void log(String msg) {
@@ -1273,6 +1273,7 @@ public class IpClient extends StateMachine {
stopAllIP(); stopAllIP();
resetLinkProperties(); resetLinkProperties();
mCallback.onLinkPropertiesChange(new LinkProperties(mLinkProperties));
if (mStartTimeMillis > 0) { if (mStartTimeMillis > 0) {
recordMetric(IpManagerEvent.COMPLETE_LIFECYCLE); recordMetric(IpManagerEvent.COMPLETE_LIFECYCLE);
mStartTimeMillis = 0; mStartTimeMillis = 0;

6
tests/net/java/android/net/ip/IpManagerTest.java
View File

@@ -69,6 +69,8 @@ import java.util.Set;
/** /**
* Tests for IpManager. * Tests for IpManager.
*
* TODO: Rename to IpClientTest.
*/ */
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
@SmallTest @SmallTest
@@ -111,6 +113,10 @@ public class IpManagerTest {
verify(mNMService, times(1)).registerObserver(arg.capture()); verify(mNMService, times(1)).registerObserver(arg.capture());
mObserver = arg.getValue(); mObserver = arg.getValue();
reset(mNMService); reset(mNMService);
final LinkProperties emptyLp = new LinkProperties();
emptyLp.setInterfaceName(ifname);
verify(mCb, timeout(100)).onLinkPropertiesChange(eq(emptyLp));
reset(mCb);
return ipm; return ipm;
} }