Merge "Cleanup leftover commented code." am: 89268e42f2 am: da8ad481d3

am: 6fe1ac0066

Change-Id: I574b525b90709c3f1256c60a5f0dfb41b6c4c69a

tests/cts/hostside/app/src/com/android/cts/net/hostside/VpnTest.java

@@ -779,17 +779,6 @@ public class VpnTest extends InstrumentationTestCase {
         assertEquals(expected, mCM.getProxyForNetwork(network));
     }
 
-//    public void testIsAlwaysOnIsLockdownNotAlwaysOn() throws Exception {
-//        if (!supportedHardware()) return;
-//
-//        // This package is the VPN app, so we can call the APIs directly.
-//
-//        startVpn(new String[] {"192.0.2.2/32", "2001:db8:1:2::ffe/128"},
-//                new String[] {"0.0.0.0/0", "::/0"},
-//                mPackageName /* allowedApps */, "",
-//                null /* proxyInfo */);
-//    }
-
     class ProxyChangeBroadcastReceiver extends BlockingBroadcastReceiver {
         private boolean received;