diff options
author | Arthur Eubanks <aeubanks@google.com> | 2018-02-13 13:31:58 -0800 |
---|---|---|
committer | Arthur Eubanks <aeubanks@google.com> | 2018-02-13 13:32:37 -0800 |
commit | 209bc95678d6527fa4d1b803da28ad76a2368aec (patch) | |
tree | 962d3ef72b7be690e0e9e4c516f6650053e741fd | |
parent | 607ef1a4839701965158f94c69d61bb601a98b41 (diff) | |
download | contrib-209bc95678d6527fa4d1b803da28ad76a2368aec.tar.gz |
Use whitelist instead of tempwhitelist
Test: make google-tradefed-all
Test: forrest
Change-Id: Iecbc53bfb11aa95c08bfa50481aa1b04bd04427f
-rw-r--r-- | src/com/android/tradefed/targetprep/AddWhitelistPackage.java | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/com/android/tradefed/targetprep/AddWhitelistPackage.java b/src/com/android/tradefed/targetprep/AddWhitelistPackage.java index 0bd0109..92e628c 100644 --- a/src/com/android/tradefed/targetprep/AddWhitelistPackage.java +++ b/src/com/android/tradefed/targetprep/AddWhitelistPackage.java @@ -29,14 +29,6 @@ import java.util.List; */ @OptionClass(alias = "add-whitelist-package") public class AddWhitelistPackage extends BaseTargetPreparer implements ITargetCleaner { - - @Option( - name = "whitelist-package-time", - description = "Duration to put package in whitelist", - isTimeVal = true - ) - private long mDurationMillis = 10000L; - @Option( name = "whitelist-package-name", description = "Name of package to put in whitelist" @@ -48,8 +40,7 @@ public class AddWhitelistPackage extends BaseTargetPreparer implements ITargetCl throws TargetSetupError, BuildError, DeviceNotAvailableException { for (String pkg : mPackages) { device.executeShellCommand( - String.format("dumpsys deviceidle tempwhitelist -d %d %s", mDurationMillis, - pkg)); + String.format("dumpsys deviceidle whitelist +%s", pkg)); } } @@ -58,7 +49,7 @@ public class AddWhitelistPackage extends BaseTargetPreparer implements ITargetCl throws DeviceNotAvailableException { for (String pkg : mPackages) { device.executeShellCommand( - String.format("dumpsys deviceidle tempwhitelist -r %s", pkg)); + String.format("dumpsys deviceidle whitelist -%s", pkg)); } } } |