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

Commit 8c1372ed authored by Chiachang Wang's avatar Chiachang Wang
Browse files

Update to positive logic to better match the method naming 

The method checkInterfacePresent seems that should return if the
interface is present or not, but it actually return an opposite
result. It may confuse the caller. E.g. The override method in
VpnTest assume it always returns true in the test. It will fail
the vpn start flow due to interface gone.

Bug: 169215213
Test: atest FrameworksNetTess
Change-Id: I3e9a64f0900336b8205674b94db68f090b4e9ff9
parent c3207fbf

services/core/java/com/android/server/connectivity/Vpn.java

+3 −3
Original line number Diff line number Diff line
@@ -380,8 +380,8 @@ public class Vpn { 
            }

        }



        public boolean checkInterfacePresent(final Vpn vpn, final String iface) {

            return vpn.jniCheck(iface) == 0;

        public boolean isInterfacePresent(final Vpn vpn, final String iface) {

            return vpn.jniCheck(iface) != 0;

        }

    }
@@ -2989,7 +2989,7 @@ public class Vpn { 
                    checkInterruptAndDelay(false);



                    // Check if the interface is gone while we are waiting.

                    if (mDeps.checkInterfacePresent(Vpn.this, mConfig.interfaze)) {

                    if (!mDeps.isInterfacePresent(Vpn.this, mConfig.interfaze)) {

                        throw new IllegalStateException(mConfig.interfaze + " is gone");

                    }

tests/net/java/com/android/server/connectivity/VpnTest.java

+1 −1
Original line number Diff line number Diff line
@@ -1263,7 +1263,7 @@ public class VpnTest { 
        }



        @Override

        public boolean checkInterfacePresent(final Vpn vpn, final String iface) {

        public boolean isInterfacePresent(final Vpn vpn, final String iface) {

            return true;

        }

    }