Merge change 5032 into donut
* changes:
Combined early suspend and wake lock content into existing power management document because content was duplicated. Updated TOC to reflect this change. Will do a separate CL to clean up the text itself.
diff --git a/samples/ApiDemos/Android.mk b/samples/ApiDemos/Android.mk
index e10ef43..7921120 100644
--- a/samples/ApiDemos/Android.mk
+++ b/samples/ApiDemos/Android.mk
@@ -1,7 +1,7 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := samples
+LOCAL_MODULE_TAGS := samples tests
# Only compile source java files in this apk.
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/testrunner/test_defs.xml b/testrunner/test_defs.xml
index 9cb780d..08fe0e8 100644
--- a/testrunner/test_defs.xml
+++ b/testrunner/test_defs.xml
@@ -185,6 +185,14 @@
continuous="true"
cts="true" />
+<test name="cts-permission2"
+ build_path="cts/tests/tests/permission2"
+ package="com.android.cts.permission2"
+ runner="android.test.InstrumentationTestRunner"
+ coverage_target="framework"
+ continuous="true"
+ cts="true" />
+
<test name="cts-process"
build_path="cts/tests"
package="com.android.cts.process"