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

Commit 66c85166 authored by Roshan Pius's avatar Roshan Pius Committed by android-build-merger
Browse files

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

am: e3396622

Change-Id: I402078a9ad6d92441cf34ca0b9459ee51adac984
parents bd829910 e3396622
Loading
Loading
Loading
Loading
+2 −3
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 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;
+0 −6
Original line number Diff line number Diff line
@@ -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;
    }