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

Commit 79eee71f authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Don't crash or wtf if the interface doesn't exist. 

This prevents the code from issuing a Log.wtf due to calling
transitionTo in ClearingIpAddressesState#enter if the interface
does not exist when IpClient starts provisioning is called.

This prevents IpClientIntegrationTest from crashing on eng builds
due to the Log.wtf being unhandled.

Bug: 155005801
Bug: 152723363
Test: atest NetworkStackNextIntegrationTests:IpClientIntegrationTest#testRestoreInitialInterfaceMtu_NotFoundInterfaceWhenStartingProvisioning
Change-Id: I4f34343816202c996f9227b72d453ea4a464f4b8
parent 0d08b449

src/android/net/ip/IpClient.java

+13 −11
Original line number Diff line number Diff line
@@ -1699,25 +1699,27 @@ public class IpClient extends StateMachine { 
    class ClearingIpAddressesState extends State {

        @Override

        public void enter() {

            if (readyToProceed()) {

                deferMessage(obtainMessage(CMD_ADDRESSES_CLEARED));

            } else {

                // Clear all IPv4 and IPv6 before proceeding to RunningState.

                // Clean up any leftover state from an abnormal exit from

                // tethering or during an IpClient restart.

                stopAllIP();

            }



            // Ensure that interface parameters are fetched on the handler thread so they are

            // properly ordered with other events, such as restoring the interface MTU on teardown.

            mInterfaceParams = mDependencies.getInterfaceParams(mInterfaceName);

            if (mInterfaceParams == null) {

                logError("Failed to find InterfaceParams for " + mInterfaceName);

                doImmediateProvisioningFailure(IpManagerEvent.ERROR_INTERFACE_NOT_FOUND);

                transitionTo(mStoppedState);

                deferMessage(obtainMessage(CMD_STOP));

                return;

            }



            mLinkObserver.setInterfaceParams(mInterfaceParams);



            if (readyToProceed()) {

                deferMessage(obtainMessage(CMD_ADDRESSES_CLEARED));

            } else {

                // Clear all IPv4 and IPv6 before proceeding to RunningState.

                // Clean up any leftover state from an abnormal exit from

                // tethering or during an IpClient restart.

                stopAllIP();

            }



            mCallback.setNeighborDiscoveryOffload(true);

        }
@@ -1752,7 +1754,7 @@ public class IpClient extends StateMachine { 
        }



        private boolean readyToProceed() {

            return (!mLinkProperties.hasIpv4Address() && !mLinkProperties.hasGlobalIpv6Address());

            return !mLinkProperties.hasIpv4Address() && !mLinkProperties.hasGlobalIpv6Address();

        }

    }