Cleanup atrace and dumpsys tests
Change-Id: I21a20624f80b9f2ecc583f7b49769615847416da
diff --git a/hostsidetests/atrace/Android.mk b/hostsidetests/atrace/Android.mk
index 4bde535..1fd7102 100644
--- a/hostsidetests/atrace/Android.mk
+++ b/hostsidetests/atrace/Android.mk
@@ -18,8 +18,6 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_MODULE_TAGS := optional
-
# Must match the package name in CtsTestCaseList.mk
LOCAL_MODULE := CtsAtraceHostTestCases
diff --git a/hostsidetests/dumpsys/Android.mk b/hostsidetests/dumpsys/Android.mk
index 51ea31f..5b63199 100644
--- a/hostsidetests/dumpsys/Android.mk
+++ b/hostsidetests/dumpsys/Android.mk
@@ -18,8 +18,6 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_MODULE_TAGS := optional
-
# Must match the package name in CtsTestCaseList.mk
LOCAL_MODULE := CtsDumpsysHostTestCases
diff --git a/hostsidetests/dumpsys/src/android/dumpsys/cts/DumpsysHostTest.java b/hostsidetests/dumpsys/src/android/dumpsys/cts/DumpsysHostTest.java
index fec4b40..4e70264 100644
--- a/hostsidetests/dumpsys/src/android/dumpsys/cts/DumpsysHostTest.java
+++ b/hostsidetests/dumpsys/src/android/dumpsys/cts/DumpsysHostTest.java
@@ -49,11 +49,6 @@
* @throws Exception
*/
public void testProcstatsOutput() throws Exception {
- if (mDevice.getApiLevel() < 19) {
- Log.i(TAG, "No Procstats output before KitKat, skipping test.");
- return;
- }
-
String procstats = mDevice.executeShellCommand("dumpsys procstats -c");
assertNotNull(procstats);
assertTrue(procstats.length() > 0);
@@ -338,11 +333,6 @@
* @throws Exception
*/
public void testBatterystatsOutput() throws Exception {
- if (mDevice.getApiLevel() < 21) {
- Log.i(TAG, "Batterystats output before Lollipop, skipping test.");
- return;
- }
-
String batterystats = mDevice.executeShellCommand("dumpsys batterystats --checkin");
assertNotNull(batterystats);
assertTrue(batterystats.length() > 0);
