Add apk installer to amperf-preparers
Also add some logging to AddWhitelistPackage
Apk installer is so that whitelist will happen after packages are
installed.
Test: forrest
Change-Id: Ia90186e7baa1e228e4f3af189eb5a634e55ef81a
diff --git a/res/config/google/preparers/amperf-preparers.xml b/res/config/google/preparers/amperf-preparers.xml
index fb2664a..2db8f2d 100644
--- a/res/config/google/preparers/amperf-preparers.xml
+++ b/res/config/google/preparers/amperf-preparers.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="ActivityManager Performance Tests Target Preparers">
+ <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup" />
<target_preparer class="com.android.tradefed.targetprep.AddWhitelistPackage" />
<include name="google/template/preparers/performance" />
diff --git a/src/com/android/tradefed/targetprep/AddWhitelistPackage.java b/src/com/android/tradefed/targetprep/AddWhitelistPackage.java
index 92e628c..5b32f6d 100644
--- a/src/com/android/tradefed/targetprep/AddWhitelistPackage.java
+++ b/src/com/android/tradefed/targetprep/AddWhitelistPackage.java
@@ -20,6 +20,7 @@
import com.android.tradefed.config.OptionClass;
import com.android.tradefed.device.DeviceNotAvailableException;
import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.log.LogUtil.CLog;
import java.util.ArrayList;
import java.util.List;
@@ -42,6 +43,8 @@
device.executeShellCommand(
String.format("dumpsys deviceidle whitelist +%s", pkg));
}
+
+ CLog.d(device.executeShellCommand("dumpsys deviceidle whitelist"));
}
@Override