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

Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD - DO NOT MERGE

Browse Source 
Change-Id: I5a20ec8986f2bfc810cec42ca7b33310aba337a4
This commit is contained in:
Bill Yi
2017-09-15 13:55:36 -07:00
parent 04038eb317 b411a9d3c1
commit cbc75fa643
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
View File

@@ -114,7 +114,6 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation
private int mMyUid; private int mMyUid;
private String mMeteredWifi; private String mMeteredWifi;
private MyServiceClient mServiceClient; private MyServiceClient mServiceClient;
private boolean mHasWatch;
private String mDeviceIdleConstantsSetting; private String mDeviceIdleConstantsSetting;
private boolean mSupported; private boolean mSupported;
@@ -130,13 +129,7 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation
mMyUid = getUid(mContext.getPackageName()); mMyUid = getUid(mContext.getPackageName());
mServiceClient = new MyServiceClient(mContext); mServiceClient = new MyServiceClient(mContext);
mServiceClient.bind(); mServiceClient.bind();
mHasWatch = mContext.getPackageManager().hasSystemFeature( mDeviceIdleConstantsSetting = "device_idle_constants";
PackageManager.FEATURE_WATCH);
if (mHasWatch) {
mDeviceIdleConstantsSetting = "device_idle_constants_watch";
} else {
mDeviceIdleConstantsSetting = "device_idle_constants";
}
mSupported = setUpActiveNetworkMeteringState(); mSupported = setUpActiveNetworkMeteringState();
Log.i(TAG, "Apps status on " + getName() + ":\n" Log.i(TAG, "Apps status on " + getName() + ":\n"