Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger
Bug: 32849428
* goog/cw-f-dev: (122 commits)
Fixed CTS unit tests
Fixing layout of several test suites for round screens.
Fix test case context which is not fully visible on wear.
Fix build for nyc-dr1-dev
Check that H.264 is available before checking max frame rate
DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r14
DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r13
Run DynamicConfig setup twice
DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r4
Fix UserRestrictionsTest.testUserRestrictions_secondaryProfileOwnerOnly
Generate and include checksum data with CTS report submissions Test: Used exploratory tests and unit tests in ChecksumReporterTest.java to verify the behavior. * All TestResults are added from an InvocationResult * Able to verify TestResult against previously calculated checksum * CRCs are created for all files in a directory including subdirectories * Checksum integrity is maintained while serializing to/from disk * When possible checksum data is compressed before report submission
Add retry logic for adoptable storage tests
Catch case where browser is protected by a permission
Fix failure due to accessibility node not updated after scrolling.
Fix DO/PO Wifi CTS
Test: Fix testFindAll result listener not set issue
Updating CTS Security patch to 2017-01
DO NOT MERGE ANYWHERE: bump cts for 201701 security public bulletin
DO NOT MERGE ANYWHERE: bump cts for 201701 security public bulletin
CTS Test for security vulnerability fix: Effect command might allow negative indexes
...
Change-Id: I07b3bb0249eebcae5760d08c98cdde1ac5b01601
diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
index b4d7d9d..cbd8fea 100644
--- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
+++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
@@ -29,6 +29,7 @@
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
+import android.content.pm.PackageManager;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.net.NetworkInfo.DetailedState;
@@ -99,6 +100,8 @@
protected WifiManager mWfm;
protected int mUid;
private String mMeteredWifi;
+ private boolean mHasWatch;
+ private String mDeviceIdleConstantsSetting;
@Override
protected void setUp() throws Exception {
@@ -110,7 +113,13 @@
mWfm = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
mUid = getUid(TEST_APP2_PKG);
final int myUid = getUid(mContext.getPackageName());
-
+ mHasWatch = mContext.getPackageManager().hasSystemFeature(
+ PackageManager.FEATURE_WATCH);
+ if (mHasWatch) {
+ mDeviceIdleConstantsSetting = "device_idle_constants_watch";
+ } else {
+ mDeviceIdleConstantsSetting = "device_idle_constants";
+ }
Log.i(TAG, "Apps status on " + getName() + ":\n"
+ "\ttest app: uid=" + myUid + ", state=" + getProcessStateByUid(myUid) + "\n"
+ "\tapp2: uid=" + mUid + ", state=" + getProcessStateByUid(mUid));
@@ -726,14 +735,14 @@
}
protected void setPendingIntentWhitelistDuration(int durationMs) throws Exception {
- final String command = String.format(
- "settings put global device_idle_constants %s=%d",
- "notification_whitelist_duration", durationMs);
- executeSilentShellCommand(command);
+ executeSilentShellCommand(String.format(
+ "settings put global %s %s=%d", mDeviceIdleConstantsSetting,
+ "notification_whitelist_duration", durationMs));
}
protected void resetDeviceIdleSettings() throws Exception {
- executeShellCommand("settings delete global device_idle_constants");
+ executeShellCommand(String.format("settings delete global %s",
+ mDeviceIdleConstantsSetting));
}
protected void startForegroundService() throws Exception {