LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add CTS tests for registerDefaultNetworkCallbackAsUid. am: ed26ffe92d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669267

Change-Id: Id8d968130a52d419c65a628fb93e47e5ac48c81e
This commit is contained in:
Lorenzo Colitti
2021-04-09 15:59:13 +00:00
committed by Automerger Merge Worker
parent cfd7518bdc ed26ffe92d
commit 6cbdc19b2c
3 changed files with 51 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/cts/hostside/app/Android.bp
View File

@@ -27,6 +27,7 @@ android_test_helper_app {
"androidx.test.rules", "androidx.test.rules",
"androidx.test.ext.junit", "androidx.test.ext.junit",
"compatibility-device-util-axt", "compatibility-device-util-axt",
"cts-net-utils",
"ctstestrunner-axt", "ctstestrunner-axt",
"ub-uiautomator", "ub-uiautomator",
"CtsHostsideNetworkTestsAidl", "CtsHostsideNetworkTestsAidl",

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

@@ -55,12 +55,14 @@ import android.net.Uri;
import android.net.VpnManager; import android.net.VpnManager;
import android.net.VpnService; import android.net.VpnService;
import android.net.VpnTransportInfo; import android.net.VpnTransportInfo;
import android.net.cts.util.CtsNetUtils.TestNetworkCallback;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import android.os.Process; import android.os.Process;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.os.UserHandle;
import android.provider.Settings; import android.provider.Settings;
import android.support.test.uiautomator.UiDevice; import android.support.test.uiautomator.UiDevice;
import android.support.test.uiautomator.UiObject; import android.support.test.uiautomator.UiObject;
@@ -741,13 +743,20 @@ public class VpnTest extends InstrumentationTestCase {
getInstrumentation().getTargetContext(), MyVpnService.ACTION_ESTABLISHED); getInstrumentation().getTargetContext(), MyVpnService.ACTION_ESTABLISHED);
receiver.register(); receiver.register();
// Expect the system default network not to change. // Test the behaviour of a variety of types of network callbacks.
final NeverChangeNetworkCallback neverChangeCallback = new NeverChangeNetworkCallback();
final Network defaultNetwork = mCM.getActiveNetwork(); final Network defaultNetwork = mCM.getActiveNetwork();
final NeverChangeNetworkCallback systemDefaultCallback = new NeverChangeNetworkCallback();
final NeverChangeNetworkCallback otherUidCallback = new NeverChangeNetworkCallback();
final TestNetworkCallback myUidCallback = new TestNetworkCallback();
if (SdkLevel.isAtLeastS()) { if (SdkLevel.isAtLeastS()) {
runWithShellPermissionIdentity(() -> final int otherUid = UserHandle.getUid(UserHandle.of(5), Process.FIRST_APPLICATION_UID);
mCM.registerSystemDefaultNetworkCallback(neverChangeCallback, final Handler h = new Handler(Looper.getMainLooper());
new Handler(Looper.getMainLooper())), NETWORK_SETTINGS); runWithShellPermissionIdentity(() -> {
mCM.registerSystemDefaultNetworkCallback(systemDefaultCallback, h);
mCM.registerDefaultNetworkCallbackAsUid(otherUid, otherUidCallback, h);
mCM.registerDefaultNetworkCallbackAsUid(Process.myUid(), myUidCallback, h);
}, NETWORK_SETTINGS);
assertEquals(defaultNetwork, myUidCallback.waitForAvailable());
} }
FileDescriptor fd = openSocketFdInOtherApp(TEST_HOST, 80, TIMEOUT_MS); FileDescriptor fd = openSocketFdInOtherApp(TEST_HOST, 80, TIMEOUT_MS);
@@ -767,20 +776,27 @@ public class VpnTest extends InstrumentationTestCase {
checkTrafficOnVpn(); checkTrafficOnVpn();
maybeExpectVpnTransportInfo(mCM.getActiveNetwork()); final Network vpnNetwork = myUidCallback.waitForAvailable();
assertEquals(vpnNetwork, mCM.getActiveNetwork());
assertNotEqual(defaultNetwork, vpnNetwork);
maybeExpectVpnTransportInfo(vpnNetwork);
assertNotEqual(defaultNetwork, mCM.getActiveNetwork());
if (SdkLevel.isAtLeastS()) { if (SdkLevel.isAtLeastS()) {
// Check that system default network callback has not seen any network changes, even // Check that system default network callback has not seen any network changes, even
// though the app's default network changed. This needs to be done before testing // though the app's default network changed. Also check that otherUidCallback saw no
// private DNS because checkStrictModePrivateDns will set the private DNS server to // network changes, because otherUid is in a different user and not subject to the VPN.
// a nonexistent name, which will cause validation to fail and cause the default // This needs to be done before testing private DNS because checkStrictModePrivateDns
// network to switch (e.g., from wifi to cellular). // will set the private DNS server to a nonexistent name, which will cause validation to
assertEquals(defaultNetwork, neverChangeCallback.getFirstNetwork()); // fail and could cause the default network to switch (e.g., from wifi to cellular).
neverChangeCallback.assertNeverChanged(); assertEquals(defaultNetwork, systemDefaultCallback.getFirstNetwork());
runWithShellPermissionIdentity( systemDefaultCallback.assertNeverChanged();
() -> mCM.unregisterNetworkCallback(neverChangeCallback), assertEquals(defaultNetwork, otherUidCallback.getFirstNetwork());
NETWORK_SETTINGS); otherUidCallback.assertNeverChanged();
runWithShellPermissionIdentity(() -> {
mCM.unregisterNetworkCallback(systemDefaultCallback);
mCM.unregisterNetworkCallback(otherUidCallback);
mCM.unregisterNetworkCallback(myUidCallback);
}, NETWORK_SETTINGS);
} }
checkStrictModePrivateDns(); checkStrictModePrivateDns();

28
tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
View File

@@ -111,6 +111,7 @@ import android.os.Build;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.os.MessageQueue; import android.os.MessageQueue;
import android.os.Process;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.os.VintfRuntimeInfo; import android.os.VintfRuntimeInfo;
@@ -587,12 +588,14 @@ public class ConnectivityManagerTest {
final TestNetworkCallback defaultTrackingCallback = new TestNetworkCallback(); final TestNetworkCallback defaultTrackingCallback = new TestNetworkCallback();
mCm.registerDefaultNetworkCallback(defaultTrackingCallback); mCm.registerDefaultNetworkCallback(defaultTrackingCallback);
final TestNetworkCallback systemDefaultTrackingCallback = new TestNetworkCallback(); final TestNetworkCallback systemDefaultCallback = new TestNetworkCallback();
final TestNetworkCallback perUidCallback = new TestNetworkCallback();
final Handler h = new Handler(Looper.getMainLooper());
if (shouldTestSApis()) { if (shouldTestSApis()) {
runWithShellPermissionIdentity(() -> runWithShellPermissionIdentity(() -> {
mCmShim.registerSystemDefaultNetworkCallback(systemDefaultTrackingCallback, mCmShim.registerSystemDefaultNetworkCallback(systemDefaultCallback, h);
new Handler(Looper.getMainLooper())), mCmShim.registerDefaultNetworkCallbackAsUid(Process.myUid(), perUidCallback, h);
NETWORK_SETTINGS); }, NETWORK_SETTINGS);
} }
Network wifiNetwork = null; Network wifiNetwork = null;
@@ -607,22 +610,27 @@ public class ConnectivityManagerTest {
assertNotNull("Did not receive onAvailable for TRANSPORT_WIFI request", assertNotNull("Did not receive onAvailable for TRANSPORT_WIFI request",
wifiNetwork); wifiNetwork);
final Network defaultNetwork = defaultTrackingCallback.waitForAvailable();
assertNotNull("Did not receive onAvailable on default network callback", assertNotNull("Did not receive onAvailable on default network callback",
defaultTrackingCallback.waitForAvailable()); defaultNetwork);
if (shouldTestSApis()) { if (shouldTestSApis()) {
assertNotNull("Did not receive onAvailable on system default network callback", assertNotNull("Did not receive onAvailable on system default network callback",
systemDefaultTrackingCallback.waitForAvailable()); systemDefaultCallback.waitForAvailable());
final Network perUidNetwork = perUidCallback.waitForAvailable();
assertNotNull("Did not receive onAvailable on per-UID default network callback",
perUidNetwork);
assertEquals(defaultNetwork, perUidNetwork);
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
fail("Broadcast receiver or NetworkCallback wait was interrupted."); fail("Broadcast receiver or NetworkCallback wait was interrupted.");
} finally { } finally {
mCm.unregisterNetworkCallback(callback); mCm.unregisterNetworkCallback(callback);
mCm.unregisterNetworkCallback(defaultTrackingCallback); mCm.unregisterNetworkCallback(defaultTrackingCallback);
if (shouldTestSApis()) { if (shouldTestSApis()) {
runWithShellPermissionIdentity( mCm.unregisterNetworkCallback(systemDefaultCallback);
() -> mCm.unregisterNetworkCallback(systemDefaultTrackingCallback), mCm.unregisterNetworkCallback(perUidCallback);
NETWORK_SETTINGS);
} }
} }
} }