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

Commit 35e620c6 authored by paulhu's avatar paulhu
Browse files

Fix Automated API Review issues. 

1. Some API's argument/return value must be marked either
@NonNull or @Nullable.
2. Change some system APIs to public APIs.
3. Modify the method name

Bug: 126700123
Bug: 126702339
Bug: 126699682
Bug: 118296575
Bug: 126699216
Bug: 126699675
Bug: 126699429
Bug: 126699193
Bug: 123586045
Test: atest FrameworksNetTests
Change-Id: Iaa2832cdcf83758ed0fec81b954a0c63bc5a7bf6
parent d8face3d

src/android/net/dhcp/DhcpServingParams.java

+1 −1
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ public class DhcpServingParams { 
            if (mLinkMtu != MTU_UNSET && (mLinkMtu < IPV4_MIN_MTU || mLinkMtu > IPV4_MAX_MTU)) {

                throw new InvalidParameterException("Invalid link MTU: " + mLinkMtu);

            }

            if (!mServerAddr.isIPv4()) {

            if (!mServerAddr.isIpv4()) {

                throw new InvalidParameterException("serverAddr must be IPv4");

            }

            if (mServerAddr.getPrefixLength() < MIN_PREFIX_LENGTH

src/android/net/ip/IpClient.java

+7 −7
Original line number Diff line number Diff line
@@ -834,7 +834,7 @@ public class IpClient extends StateMachine { 
    static boolean isProvisioned(LinkProperties lp, InitialConfiguration config) {

        // For historical reasons, we should connect even if all we have is

        // an IPv4 address and nothing else.

        if (lp.hasIPv4Address() || lp.isProvisioned()) {

        if (lp.hasIpv4Address() || lp.isProvisioned()) {

            return true;

        }

        if (config == null) {
@@ -878,9 +878,9 @@ public class IpClient extends StateMachine { 
            delta = PROV_CHANGE_LOST_PROVISIONING;

        }



        final boolean lostIPv6 = oldLp.isIPv6Provisioned() && !newLp.isIPv6Provisioned();

        final boolean lostIPv4Address = oldLp.hasIPv4Address() && !newLp.hasIPv4Address();

        final boolean lostIPv6Router = oldLp.hasIPv6DefaultRoute() && !newLp.hasIPv6DefaultRoute();

        final boolean lostIPv6 = oldLp.isIpv6Provisioned() && !newLp.isIpv6Provisioned();

        final boolean lostIPv4Address = oldLp.hasIpv4Address() && !newLp.hasIpv4Address();

        final boolean lostIPv6Router = oldLp.hasIpv6DefaultRoute() && !newLp.hasIpv6DefaultRoute();



        // If bad wifi avoidance is disabled, then ignore IPv6 loss of

        // provisioning. Otherwise, when a hotspot that loses Internet
@@ -920,7 +920,7 @@ public class IpClient extends StateMachine { 
        // If the previous link properties had a global IPv6 address and an

        // IPv6 default route then also consider the loss of that default route

        // to be a loss of provisioning. See b/27962810.

        if (oldLp.hasGlobalIPv6Address() && (lostIPv6Router && !ignoreIPv6ProvisioningLoss)) {

        if (oldLp.hasGlobalIpv6Address() && (lostIPv6Router && !ignoreIPv6ProvisioningLoss)) {

            delta = PROV_CHANGE_LOST_PROVISIONING;

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


    private boolean applyInitialConfig(InitialConfiguration config) {

        // TODO: also support specifying a static IPv4 configuration in InitialConfiguration.

        for (LinkAddress addr : findAll(config.ipAddresses, LinkAddress::isIPv6)) {

        for (LinkAddress addr : findAll(config.ipAddresses, LinkAddress::isIpv6)) {

            if (!mInterfaceCtrl.addAddress(addr)) return false;

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



        private boolean readyToProceed() {

            return (!mLinkProperties.hasIPv4Address() && !mLinkProperties.hasGlobalIPv6Address());

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

        }

    }

src/android/net/ip/IpReachabilityMonitor.java

+2 −2
Original line number Diff line number Diff line
@@ -316,8 +316,8 @@ public class IpReachabilityMonitor { 
        }



        final boolean lostProvisioning =

                (mLinkProperties.isIPv4Provisioned() && !whatIfLp.isIPv4Provisioned())

                || (mLinkProperties.isIPv6Provisioned() && !whatIfLp.isIPv6Provisioned());

                (mLinkProperties.isIpv4Provisioned() && !whatIfLp.isIpv4Provisioned())

                || (mLinkProperties.isIpv6Provisioned() && !whatIfLp.isIpv6Provisioned());



        if (lostProvisioning) {

            final String logMsg = "FAILURE: LOST_PROVISIONING, " + event;