Snap for 4535700 from e473fe22fd0931ce459077f4011769f6fd520641 to pi-release

Change-Id: I66590a20d35545bae62ffacc1be622acfc627ab7

3 files changed, 38 insertions, 2 deletions

diff --git a/res/config/google/preparers/amperf-preparers.xml b/res/config/google/preparers/amperf-preparers.xml
new file mode 100644
index 0000000..3543aaa
--- /dev/null
+++ b/res/config/google/preparers/amperf-preparers.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 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.
+-->
+<configuration description="ActivityManager Performance Tests Target Preparers">
+    <target_preparer class="com.android.tradefed.targetprep.AddWhitelistPackage" />
+</configuration>
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:";