commit 9f3d17f27d1612dc3cc0b7f127b59af1172a0839
author Suprabh Shukla <suprabh@google.com> Mon Apr 18 17:31:22 2016 -0700
committer Suprabh Shukla <suprabh@google.com> Tue Apr 19 17:40:04 2016 -0700
tree 525ec60c242488de119a0f489375001cadf51477
parent e4d763b548cb3619771a0db63da12bc2f2901140

Reducing flakiness from Automater test

The test seemed to be failing because the screen was off or locked.
Added a launchpad activity which will dismiss keyguard and power on the
screen before starting the app_details activity. Also added
remove-active-admin as a tear down command and improved logging
to better troubleshoot failures in the future.

Bug: b/28067602
Change-Id: I348ca8bd4105afa1b37a71959fdadb56b36b76bb

tests/deviceadmin/deviceadminapp/Android.mk

diff --git a/tests/deviceadmin/deviceadminapp/Android.mk b/tests/deviceadmin/deviceadminapp/Android.mk
index 29c7cb3..6ee3943 100644
--- a/tests/deviceadmin/deviceadminapp/Android.mk
+++ b/tests/deviceadmin/deviceadminapp/Android.mk
@@ -31,4 +31,4 @@
 # tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
 
-include $(BUILD_PACKAGE)
+include $(BUILD_CTS_PACKAGE)