Merge "No longer using specific watch device idle settings" into oc-dev am: 8bde47ae82
am: eb2c021f93
Change-Id: Iff4af17accb81c3111c0a7517dfcb295858ad48f
This commit is contained in:
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user