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

Snap for 6473661 from 5a32491329a93e3f419513ba52768993ca66472c to rvc-release

Browse Source 
Change-Id: I6ffc11665d8d2fbd3e333d2642d8ff44ea8f5071
This commit is contained in:
android-build-team Robot
2020-05-08 01:11:12 +00:00
parent 2cdfa3ea3b a25d852b12
commit a090f1d010
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractAppIdleTestCase.java
View File

@@ -50,7 +50,7 @@ abstract class AbstractAppIdleTestCase extends AbstractRestrictBackgroundNetwork
public final void tearDown() throws Exception {
super.tearDown();
turnBatteryOff();
executeSilentShellCommand("cmd battery reset");
setAppIdle(false);
}
@@ -131,11 +131,11 @@ abstract class AbstractAppIdleTestCase extends AbstractRestrictBackgroundNetwork
@RequiredProperties({BATTERY_SAVER_MODE})
@Test
public void testAppIdleNetworkAccess_whenCharging() throws Exception {
// Check that idle app doesn't get network when charging
// Check that app is paroled when charging
setAppIdle(true);
assertBackgroundNetworkAccess(false);
turnBatteryOff();
assertBackgroundNetworkAccess(false);
assertBackgroundNetworkAccess(true);
turnBatteryOn();
assertBackgroundNetworkAccess(false);

18
tests/cts/hostside/src/com/android/cts/net/NetworkPolicyTestsPreparer.java
View File

@@ -24,6 +24,9 @@ import com.android.tradefed.targetprep.ITargetPreparer;
public class NetworkPolicyTestsPreparer implements ITargetPreparer {
private ITestDevice mDevice;
private String mOriginalAppStandbyEnabled;
private String mOriginalBatteryStatsConstants;
private final static String KEY_STABLE_CHARGING_DELAY_MS = "battery_charged_delay_ms";
private final static int DESIRED_STABLE_CHARGING_DELAY_MS = 0;
@Override
public void setUp(TestInformation testInformation) throws DeviceNotAvailableException {
@@ -31,12 +34,18 @@ public class NetworkPolicyTestsPreparer implements ITargetPreparer {
mOriginalAppStandbyEnabled = getAppStandbyEnabled();
setAppStandbyEnabled("1");
LogUtil.CLog.d("Original app_standby_enabled: " + mOriginalAppStandbyEnabled);
mOriginalBatteryStatsConstants = getBatteryStatsConstants();
setBatteryStatsConstants(
KEY_STABLE_CHARGING_DELAY_MS + "=" + DESIRED_STABLE_CHARGING_DELAY_MS);
LogUtil.CLog.d("Original battery_saver_constants: " + mOriginalBatteryStatsConstants);
}
@Override
public void tearDown(TestInformation testInformation, Throwable e)
throws DeviceNotAvailableException {
setAppStandbyEnabled(mOriginalAppStandbyEnabled);
setBatteryStatsConstants(mOriginalBatteryStatsConstants);
}
private void setAppStandbyEnabled(String appStandbyEnabled) throws DeviceNotAvailableException {
@@ -51,6 +60,15 @@ public class NetworkPolicyTestsPreparer implements ITargetPreparer {
return executeCmd("settings get global app_standby_enabled").trim();
}
private void setBatteryStatsConstants(String batteryStatsConstants)
throws DeviceNotAvailableException {
executeCmd("settings put global battery_stats_constants \"" + batteryStatsConstants + "\"");
}
private String getBatteryStatsConstants() throws DeviceNotAvailableException {
return executeCmd("settings get global battery_stats_constants");
}
private String executeCmd(String cmd) throws DeviceNotAvailableException {
final String output = mDevice.executeShellCommand(cmd).trim();
LogUtil.CLog.d("Output for '%s': %s", cmd, output);

1
tests/cts/tethering/AndroidTest.xml
View File

@@ -16,6 +16,7 @@
<configuration description="Config for CTS Tethering test cases">
<option name="test-suite-tag" value="cts" />
<option name="config-descriptor:metadata" key="component" value="networking" />
<option name="config-descriptor:metadata" key="token" value="SIM_CARD" />
<option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
<option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
<option name="config-descriptor:metadata" key="parameter" value="secondary_user" />