Merge "No longer using specific watch device idle settings" into oc-dev
am: 8bde47ae82
Change-Id: I46f8f4bdfea7ae4f75119226cbaa100365a260db
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 12b338f..f3d5d2c 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
@@ -114,7 +114,6 @@
private int mMyUid;
private String mMeteredWifi;
private MyServiceClient mServiceClient;
- private boolean mHasWatch;
private String mDeviceIdleConstantsSetting;
private boolean mSupported;
@@ -130,13 +129,7 @@
mMyUid = getUid(mContext.getPackageName());
mServiceClient = new MyServiceClient(mContext);
mServiceClient.bind();
- mHasWatch = mContext.getPackageManager().hasSystemFeature(
- PackageManager.FEATURE_WATCH);
- if (mHasWatch) {
- mDeviceIdleConstantsSetting = "device_idle_constants_watch";
- } else {
- mDeviceIdleConstantsSetting = "device_idle_constants";
- }
+ mDeviceIdleConstantsSetting = "device_idle_constants";
mSupported = setUpActiveNetworkMeteringState();
Log.i(TAG, "Apps status on " + getName() + ":\n"