diff options
author | Arthur Eubanks <aeubanks@google.com> | 2018-01-09 13:52:31 -0800 |
---|---|---|
committer | Arthur Eubanks <aeubanks@google.com> | 2018-01-09 14:09:38 -0800 |
commit | cda13f76f355649b114f37e34ca394d9783ea099 (patch) | |
tree | 445703762ce095fc13e35c36d449b5c13b245bbe /src/com | |
parent | 25bda92eeffdc89b485c910171e06909034e7b50 (diff) | |
download | contrib-cda13f76f355649b114f37e34ca394d9783ea099.tar.gz |
Add OptionClass and set default timeout for AddWhitelistPackage
Also update copyright
Test: make
Change-Id: I8a66c81fa999bf3a3d8668b4bf4d3fb1c6cd2776
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/tradefed/targetprep/AddWhitelistPackage.java | 4 | ||||
-rw-r--r-- | src/com/android/tradefed/targetprep/SetPackagesRecentlyUsed.java | 18 |
2 files changed, 20 insertions, 2 deletions
diff --git a/src/com/android/tradefed/targetprep/AddWhitelistPackage.java b/src/com/android/tradefed/targetprep/AddWhitelistPackage.java index 491f9e4..0bd0109 100644 --- a/src/com/android/tradefed/targetprep/AddWhitelistPackage.java +++ b/src/com/android/tradefed/targetprep/AddWhitelistPackage.java @@ -17,6 +17,7 @@ package com.android.tradefed.targetprep; import com.android.tradefed.build.IBuildInfo; import com.android.tradefed.config.Option; +import com.android.tradefed.config.OptionClass; import com.android.tradefed.device.DeviceNotAvailableException; import com.android.tradefed.device.ITestDevice; @@ -26,6 +27,7 @@ import java.util.List; /** * Add packages to whitelist to allow it to run in the background. */ +@OptionClass(alias = "add-whitelist-package") public class AddWhitelistPackage extends BaseTargetPreparer implements ITargetCleaner { @Option( @@ -33,7 +35,7 @@ public class AddWhitelistPackage extends BaseTargetPreparer implements ITargetCl description = "Duration to put package in whitelist", isTimeVal = true ) - private long mDurationMillis; + private long mDurationMillis = 10000L; @Option( name = "whitelist-package-name", diff --git a/src/com/android/tradefed/targetprep/SetPackagesRecentlyUsed.java b/src/com/android/tradefed/targetprep/SetPackagesRecentlyUsed.java index 90986b9..d3d3b98 100644 --- a/src/com/android/tradefed/targetprep/SetPackagesRecentlyUsed.java +++ b/src/com/android/tradefed/targetprep/SetPackagesRecentlyUsed.java @@ -1,8 +1,23 @@ -// Copyright 2017 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.android.tradefed.targetprep; import com.android.tradefed.build.IBuildInfo; import com.android.tradefed.config.Option; +import com.android.tradefed.config.OptionClass; import com.android.tradefed.device.DeviceNotAvailableException; import com.android.tradefed.device.ITestDevice; @@ -15,6 +30,7 @@ import java.util.concurrent.TimeUnit; * Reads the list of packages on the phone and sets all packages to be 'last used' 24 hrs ago. * Writes to /data/system/package-usage.list and deletes it at teardown. */ +@OptionClass(alias = "set-packages-recently-used") public class SetPackagesRecentlyUsed extends BaseTargetPreparer implements ITargetCleaner { private static final String LINE_PREFIX = "package:"; |