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

Include Wear device idle settings

Browse Source 
Certain tests interacting with device idle
must set correctly both the normal and wear
device idle setting space.

Bug: 32183373

Test: Run on wear device and Nexus6P
run cts --skip-device-info -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testDozeModeMetered_enabledButWhitelistedOnNotificationAction
run cts --skip-device-info -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testDozeModeNonMetered_enabledButWhitelistedOnNotificationAction

Change-Id: I6a53d29021a7d4a257b102a4d3bd5d2cc845c16f
This commit is contained in:
Chris Manton
2016-10-14 17:30:15 -07:00
committed by Joshua Schwarz
parent 1cdcb253df
commit 1ac3a1f3fc
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@ import android.app.Instrumentation;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.net.NetworkInfo.DetailedState; import android.net.NetworkInfo.DetailedState;
@@ -99,6 +100,8 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation
protected WifiManager mWfm; protected WifiManager mWfm;
protected int mUid; protected int mUid;
private String mMeteredWifi; private String mMeteredWifi;
private boolean mHasWatch;
private String mDeviceIdleConstantsSetting;
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
@@ -110,7 +113,13 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation
mWfm = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE); mWfm = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
mUid = getUid(TEST_APP2_PKG); mUid = getUid(TEST_APP2_PKG);
final int myUid = getUid(mContext.getPackageName()); 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" Log.i(TAG, "Apps status on " + getName() + ":\n"
+ "\ttest app: uid=" + myUid + ", state=" + getProcessStateByUid(myUid) + "\n" + "\ttest app: uid=" + myUid + ", state=" + getProcessStateByUid(myUid) + "\n"
+ "\tapp2: uid=" + mUid + ", state=" + getProcessStateByUid(mUid)); + "\tapp2: uid=" + mUid + ", state=" + getProcessStateByUid(mUid));
@@ -726,14 +735,14 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation
} }
protected void setPendingIntentWhitelistDuration(int durationMs) throws Exception { protected void setPendingIntentWhitelistDuration(int durationMs) throws Exception {
final String command = String.format( executeSilentShellCommand(String.format(
"settings put global device_idle_constants %s=%d", "settings put global %s %s=%d", mDeviceIdleConstantsSetting,
"notification_whitelist_duration", durationMs); "notification_whitelist_duration", durationMs));
executeSilentShellCommand(command);
} }
protected void resetDeviceIdleSettings() throws Exception { 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 { protected void startForegroundService() throws Exception {