Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efdca004 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Send empty LinkProperties when entering StoppedState."

parents 6a4be861 b3f9f4a3

services/net/java/android/net/ip/IpClient.java

+3 −2
Original line number Diff line number Diff line
@@ -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 Callback mCallback;

        private final Callback mCallback;



        public LoggingCallbackWrapper(Callback callback) {

            mCallback = callback;

            mCallback = (callback != null) ? callback : new Callback();

        }



        private void log(String msg) {
@@ -1273,6 +1273,7 @@ public class IpClient extends StateMachine { 
            stopAllIP();



            resetLinkProperties();

            mCallback.onLinkPropertiesChange(new LinkProperties(mLinkProperties));

            if (mStartTimeMillis > 0) {

                recordMetric(IpManagerEvent.COMPLETE_LIFECYCLE);

                mStartTimeMillis = 0;

tests/net/java/android/net/ip/IpManagerTest.java

+6 −0
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ import java.util.Set; 


/**

 * Tests for IpManager.

 *

 * TODO: Rename to IpClientTest.

 */

@RunWith(AndroidJUnit4.class)

@SmallTest
@@ -111,6 +113,10 @@ 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;

    }