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

Snap for 6416172 from 6c6036dc2514e211561688a3640a1dc470b269fd to rvc-release

Browse Source 
Change-Id: I3b7ef99ac89f9e3e63d210b01b43d0e8bc27e445
This commit is contained in:
android-build-team Robot
2020-04-22 01:13:53 +00:00
parent b019acb6a0 6f8e612264
commit ca63aaf99a
3 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -709,7 +709,7 @@ public class ConnectivityManagerTest extends AndroidTestCase {
@AppModeFull(reason = "Cannot get WifiManager in instant app mode")
public void testGetMultipathPreference() throws Exception {
final ContentResolver resolver = mContext.getContentResolver();
final Network network = ensureWifiConnected();
ensureWifiConnected();
final String ssid = unquoteSSID(mWifiManager.getConnectionInfo().getSSID());
final String oldMeteredSetting = getWifiMeteredStatus(ssid);
final String oldMeteredMultipathPreference = Settings.Global.getString(
@@ -721,6 +721,10 @@ public class ConnectivityManagerTest extends AndroidTestCase {
Integer.toString(newMeteredPreference));
setWifiMeteredStatus(ssid, "true");
waitForActiveNetworkMetered(true);
// Wifi meterness changes from unmetered to metered will disconnect and reconnect since
// R.
final Network network = mCm.getActiveNetwork();
assertEquals(ssid, unquoteSSID(mWifiManager.getConnectionInfo().getSSID()));
assertEquals(mCm.getNetworkCapabilities(network).hasCapability(
NET_CAPABILITY_NOT_METERED), false);
assertMultipathPreferenceIsEventually(network, initialMeteredPreference,
@@ -736,6 +740,7 @@ public class ConnectivityManagerTest extends AndroidTestCase {
oldMeteredPreference, newMeteredPreference);
setWifiMeteredStatus(ssid, "false");
// No disconnect from unmetered to metered.
waitForActiveNetworkMetered(false);
assertEquals(mCm.getNetworkCapabilities(network).hasCapability(
NET_CAPABILITY_NOT_METERED), true);

24
tests/cts/net/src/android/net/cts/TrafficStatsTest.java
View File

@@ -16,11 +16,9 @@
package android.net.cts;
import android.content.pm.PackageManager;
import android.net.NetworkStats;
import android.net.TrafficStats;
import android.os.Process;
import android.os.SystemProperties;
import android.platform.test.annotations.AppModeFull;
import android.test.AndroidTestCase;
import android.util.Log;
@@ -267,28 +265,6 @@ public class TrafficStatsTest extends AndroidTestCase {
assertTrue("ifrxp: " + ifaceRxPacketsBefore + " -> " + ifaceRxPacketsAfter,
totalRxPacketsAfter >= totalRxPacketsBefore + ifaceRxDeltaPackets);
// If the adb TCP port is opened, this test may be run by adb over network.
// Huge amount of data traffic might go through the network and accounted into total packets
// stats. The upper bound check would be meaningless.
// TODO: Consider precisely calculate the traffic accounted due to adb over network and
// subtract it when checking upper bound instead of skip checking.
final PackageManager pm = mContext.getPackageManager();
if (SystemProperties.getInt("persist.adb.tcp.port", -1) > -1
|| SystemProperties.getInt("service.adb.tcp.port", -1) > -1
|| !pm.hasSystemFeature(PackageManager.FEATURE_USB_ACCESSORY)) {
Log.i(LOG_TAG, "adb is running over the network, skip the upper bound check");
} else {
// Fudge by 132 packets of 1500 bytes not related to the test.
assertTrue("ttxp: " + totalTxPacketsBefore + " -> " + totalTxPacketsAfter,
totalTxPacketsAfter <= totalTxPacketsBefore + uidTxDeltaPackets + 132);
assertTrue("trxp: " + totalRxPacketsBefore + " -> " + totalRxPacketsAfter,
totalRxPacketsAfter <= totalRxPacketsBefore + uidRxDeltaPackets + 132);
assertTrue("ttxb: " + totalTxBytesBefore + " -> " + totalTxBytesAfter,
totalTxBytesAfter <= totalTxBytesBefore + uidTxDeltaBytes + 132 * 1500);
assertTrue("trxb: " + totalRxBytesBefore + " -> " + totalRxBytesAfter,
totalRxBytesAfter <= totalRxBytesBefore + uidRxDeltaBytes + 132 * 1500);
}
// Localhost traffic should *not* count against mobile stats,
// There might be some other traffic, but nowhere near 1MB.
assertInRange("mtxp", mobileTxPacketsAfter, mobileTxPacketsBefore,

29
tests/cts/net/src/android/net/cts/UrlQuerySanitizerTest.java
View File

@@ -16,16 +16,38 @@
package android.net.cts;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import android.net.UrlQuerySanitizer;
import android.net.UrlQuerySanitizer.IllegalCharacterValueSanitizer;
import android.net.UrlQuerySanitizer.ParameterValuePair;
import android.net.UrlQuerySanitizer.ValueSanitizer;
import android.test.AndroidTestCase;
import android.os.Build;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.SmallTest;
import com.android.testutils.DevSdkIgnoreRule;
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import java.util.List;
import java.util.Set;
public class UrlQuerySanitizerTest extends AndroidTestCase {
@SmallTest
@RunWith(AndroidJUnit4.class)
public class UrlQuerySanitizerTest {
@Rule
public final DevSdkIgnoreRule mIgnoreRule = new DevSdkIgnoreRule();
private static final int ALL_OK = IllegalCharacterValueSanitizer.ALL_OK;
// URL for test.
@@ -42,6 +64,7 @@ public class UrlQuerySanitizerTest extends AndroidTestCase {
private static final String AGE = "age";
private static final String HEIGHT = "height";
@Test
public void testUrlQuerySanitizer() {
MockUrlQuerySanitizer uqs = new MockUrlQuerySanitizer();
assertFalse(uqs.getAllowUnregisteredParamaters());
@@ -210,12 +233,14 @@ public class UrlQuerySanitizerTest extends AndroidTestCase {
}
@Test @IgnoreUpTo(Build.VERSION_CODES.Q) // Only fixed in R
public void testScriptUrlOk_73822755() {
ValueSanitizer sanitizer = new UrlQuerySanitizer.IllegalCharacterValueSanitizer(
UrlQuerySanitizer.IllegalCharacterValueSanitizer.SCRIPT_URL_OK);
assertEquals("javascript:alert()", sanitizer.sanitize("javascript:alert()"));
}
@Test @IgnoreUpTo(Build.VERSION_CODES.Q) // Only fixed in R
public void testScriptUrlBlocked_73822755() {
ValueSanitizer sanitizer = UrlQuerySanitizer.getUrlAndSpaceLegal();
assertEquals("", sanitizer.sanitize("javascript:alert()"));