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

Snap for 6500447 from 775e604e93273c50e5f02f396ac555ae82a79e93 to rvc-release

Browse Source 
Change-Id: I95fcd3ace3e3b15e890154d5224b1e97d046fd89
This commit is contained in:
android-build-team Robot
2020-05-16 01:14:19 +00:00
parent b816d1a932 66c5773f79
commit 021f63c980
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,7 @@ import com.android.tradefed.targetprep.ITargetPreparer;
public class NetworkPolicyTestsPreparer implements ITargetPreparer {
private ITestDevice mDevice;
private boolean mOriginalAirplaneModeEnabled;
private String mOriginalAppStandbyEnabled;
private String mOriginalBatteryStatsConstants;
private final static String KEY_STABLE_CHARGING_DELAY_MS = "battery_charged_delay_ms";
@@ -39,15 +40,29 @@ public class NetworkPolicyTestsPreparer implements ITargetPreparer {
setBatteryStatsConstants(
KEY_STABLE_CHARGING_DELAY_MS + "=" + DESIRED_STABLE_CHARGING_DELAY_MS);
LogUtil.CLog.d("Original battery_saver_constants: " + mOriginalBatteryStatsConstants);
mOriginalAirplaneModeEnabled = getAirplaneModeEnabled();
// Turn off airplane mode in case another test left the device in that state.
setAirplaneModeEnabled(false);
LogUtil.CLog.d("Original airplane mode state: " + mOriginalAirplaneModeEnabled);
}
@Override
public void tearDown(TestInformation testInformation, Throwable e)
throws DeviceNotAvailableException {
setAirplaneModeEnabled(mOriginalAirplaneModeEnabled);
setAppStandbyEnabled(mOriginalAppStandbyEnabled);
setBatteryStatsConstants(mOriginalBatteryStatsConstants);
}
private void setAirplaneModeEnabled(boolean enable) throws DeviceNotAvailableException {
executeCmd("cmd connectivity airplane-mode " + (enable ? "enable" : "disable"));
}
private boolean getAirplaneModeEnabled() throws DeviceNotAvailableException {
return "enabled".equals(executeCmd("cmd connectivity airplane-mode").trim());
}
private void setAppStandbyEnabled(String appStandbyEnabled) throws DeviceNotAvailableException {
if ("null".equals(appStandbyEnabled)) {
executeCmd("settings delete global app_standby_enabled");