From f99d8d82b4f8d86732a95def67ad2db05088b058 Mon Sep 17 00:00:00 2001
From: shreerag <shreerag@google.com>
Date: Fri, 21 Jul 2017 14:33:54 -0700
Subject: [PATCH] No longer using specific watch device idle settings

Bug: 28091250
Change-Id: Id57c5a638f5a10367d13f6353ea3212745a3f06e
---
 .../AbstractRestrictBackgroundNetworkTestCase.java       | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

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 12b338f8e5..f3d5d2c4b2 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 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation
     private int mMyUid;
     private String mMeteredWifi;
     private MyServiceClient mServiceClient;
-    private boolean mHasWatch;
     private String mDeviceIdleConstantsSetting;
     private boolean mSupported;
 
@@ -130,13 +129,7 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation
         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"