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

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

Merge "Revert "Send empty LinkProperties when entering StoppedState.""

parents 8d621cc0 f1967c41

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

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

        private Callback mCallback;





        public LoggingCallbackWrapper(Callback callback) {

        public LoggingCallbackWrapper(Callback callback) {

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

            mCallback = callback;

        }

        }





        private void log(String msg) {

        private void log(String msg) {
@@ -1283,7 +1283,6 @@ 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;

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

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




/**

/**

 * Tests for IpManager.

 * Tests for IpManager.

 *

 * TODO: Rename to IpClientTest.

 */

 */

@RunWith(AndroidJUnit4.class)

@RunWith(AndroidJUnit4.class)

@SmallTest

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

    }

    }