Merge "Update to positive logic to better match the method naming" (1c7bc039) · Commits · e / os / android_frameworks_base

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;
		}
		}

		@@ -2995,7 +2995,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");
		}

+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;
		}
		}