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

Commit 1c7bc039 authored by Chiachang Wang's avatar Chiachang Wang Committed by Gerrit Code Review
Browse files

Merge "Update to positive logic to better match the method naming"

parents 836af202 8c1372ed

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

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

            }

        }

        }





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

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

            return vpn.jniCheck(iface) == 0;

            return vpn.jniCheck(iface) != 0;

        }

        }

    }

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

                    checkInterruptAndDelay(false);





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

                    // 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");

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

                    }

                    }

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

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

        }





        @Override

        @Override

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

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

            return true;

            return true;

        }

        }

    }

    }