Fix SettingsHelper by adding class to BySelector criteria of DND switch.
am: 139cd243a8
Change-Id: I72dd6980f462ed1dd47d7ea293622e1612634b56
diff --git a/build/tasks/tests/native_test_list.mk b/build/tasks/tests/native_test_list.mk
index 3c42ef8..71f20793 100644
--- a/build/tasks/tests/native_test_list.mk
+++ b/build/tasks/tests/native_test_list.mk
@@ -52,6 +52,7 @@
kernel-config-unit-tests \
malloc_debug_unit_tests \
memory_replay_tests \
+ memunreachable_test \
minadbd_test \
minikin_tests \
mtp_ffs_handle_test \
diff --git a/tests/functional/applinktests/Android.mk b/tests/functional/applinktests/Android.mk
index c8095a2..f7550a8 100644
--- a/tests/functional/applinktests/Android.mk
+++ b/tests/functional/applinktests/Android.mk
@@ -20,12 +20,11 @@
LOCAL_SDK_VERSION := current
LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_JAVA_LIBRARIES := legacy-android-test
LOCAL_STATIC_JAVA_LIBRARIES := \
launcher-helper-lib \
ub-uiautomator \
platform-test-annotations \
- legacy-android-test \
junit
LOCAL_PACKAGE_NAME := AppLinkFunctionalTests
diff --git a/tests/functional/calculator/Android.mk b/tests/functional/calculator/Android.mk
index 20827c7..3dd4073 100644
--- a/tests/functional/calculator/Android.mk
+++ b/tests/functional/calculator/Android.mk
@@ -23,8 +23,9 @@
launcher-helper-lib \
metrics-helper-lib \
ub-uiautomator \
- services.core \
- legacy-android-test
+ services.core
+
+LOCAL_JAVA_LIBRARIES := legacy-android-test
#LOCAL_SDK_VERSION := current
diff --git a/tests/functional/devicehealthtests/Android.mk b/tests/functional/devicehealthtests/Android.mk
index 625ac44..e35b301 100644
--- a/tests/functional/devicehealthtests/Android.mk
+++ b/tests/functional/devicehealthtests/Android.mk
@@ -22,7 +22,6 @@
LOCAL_PACKAGE_NAME := DeviceHealthTests
LOCAL_CERTIFICATE := platform
-LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test platform-test-annotations
LOCAL_COMPATIBILITY_SUITE := device-tests
diff --git a/tests/functional/downloadapp/Android.mk b/tests/functional/downloadapp/Android.mk
index 27df5fc..a2c5464 100644
--- a/tests/functional/downloadapp/Android.mk
+++ b/tests/functional/downloadapp/Android.mk
@@ -6,12 +6,11 @@
LOCAL_SDK_VERSION := current
LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_JAVA_LIBRARIES := legacy-android-test
LOCAL_STATIC_JAVA_LIBRARIES := \
launcher-helper-lib \
ub-uiautomator \
- android-support-test \
- legacy-android-test
+ android-support-test
LOCAL_PACKAGE_NAME := DownloadAppFunctionalTests
LOCAL_CERTIFICATE := platform
diff --git a/tests/functional/notificationtests/Android.mk b/tests/functional/notificationtests/Android.mk
index 5c255a0..a48bf81 100644
--- a/tests/functional/notificationtests/Android.mk
+++ b/tests/functional/notificationtests/Android.mk
@@ -23,8 +23,9 @@
launcher-helper-lib \
metrics-helper-lib \
ub-uiautomator \
- services.core \
- legacy-android-test
+ services.core
+
+LOCAL_JAVA_LIBRARIES := legacy-android-test
#LOCAL_SDK_VERSION := current
diff --git a/tests/functional/overviewtests/Android.mk b/tests/functional/overviewtests/Android.mk
index 25392a6..32a69e8 100644
--- a/tests/functional/overviewtests/Android.mk
+++ b/tests/functional/overviewtests/Android.mk
@@ -23,8 +23,9 @@
ub-uiautomator \
timeresult-helper-lib \
launcher-helper-lib \
- android-support-test \
- legacy-android-test
+ android-support-test
+
+LOCAL_JAVA_LIBRARIES := legacy-android-test
LOCAL_SDK_VERSION := current
diff --git a/tests/functional/permission/Android.mk b/tests/functional/permission/Android.mk
index 4e8c407..89c5de6 100644
--- a/tests/functional/permission/Android.mk
+++ b/tests/functional/permission/Android.mk
@@ -6,13 +6,12 @@
LOCAL_SDK_VERSION := current
LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_JAVA_LIBRARIES := legacy-android-test
LOCAL_STATIC_JAVA_LIBRARIES := \
ub-uiautomator \
launcher-helper-lib \
permission-helper \
package-helper \
- legacy-android-test \
junit
LOCAL_PACKAGE_NAME := PermissionFunctionalTests
diff --git a/tests/functional/systemmetrics/Android.mk b/tests/functional/systemmetrics/Android.mk
index 9d7e51a..d1a51ff 100644
--- a/tests/functional/systemmetrics/Android.mk
+++ b/tests/functional/systemmetrics/Android.mk
@@ -22,8 +22,9 @@
android-support-test \
metrics-helper-lib \
ub-uiautomator \
- services.core \
- legacy-android-test
+ services.core
+
+LOCAL_JAVA_LIBRARIES := legacy-android-test
#LOCAL_SDK_VERSION := current
diff --git a/tests/jank/UbSystemUiJankTests/Android.mk b/tests/jank/UbSystemUiJankTests/Android.mk
index 5741713..de87765 100644
--- a/tests/jank/UbSystemUiJankTests/Android.mk
+++ b/tests/jank/UbSystemUiJankTests/Android.mk
@@ -22,6 +22,8 @@
LOCAL_STATIC_JAVA_LIBRARIES := ub-janktesthelper ub-uiautomator launcher-helper-lib \
timeresult-helper-lib sysui-helper
+LOCAL_JAVA_LIBRARIES := legacy-android-test
+
LOCAL_COMPATIBILITY_SUITE := device-tests
include $(BUILD_PACKAGE)
diff --git a/tests/jank/jankmicrobenchmark/Android.mk b/tests/jank/jankmicrobenchmark/Android.mk
index 47464a4..55ee778 100644
--- a/tests/jank/jankmicrobenchmark/Android.mk
+++ b/tests/jank/jankmicrobenchmark/Android.mk
@@ -23,9 +23,10 @@
ub-uiautomator \
ub-janktesthelper \
launcher-helper-lib \
- legacy-android-test \
junit
+LOCAL_JAVA_LIBRARIES := legacy-android-test
+
LOCAL_SDK_VERSION := current
LOCAL_COMPATIBILITY_SUITE := device-tests
diff --git a/tests/jank/sysapp_wear/Android.mk b/tests/jank/sysapp_wear/Android.mk
index ad1aae8..c47be20 100644
--- a/tests/jank/sysapp_wear/Android.mk
+++ b/tests/jank/sysapp_wear/Android.mk
@@ -22,9 +22,10 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
ub-uiautomator \
ub-janktesthelper \
- legacy-android-test \
junit
+LOCAL_JAVA_LIBRARIES := legacy-android-test
+
LOCAL_SDK_VERSION := current
LOCAL_COMPATIBILITY_SUITE := device-tests
diff --git a/tests/jank/touch_latency_wear/Android.mk b/tests/jank/touch_latency_wear/Android.mk
index c1c4e21..56afd10 100644
--- a/tests/jank/touch_latency_wear/Android.mk
+++ b/tests/jank/touch_latency_wear/Android.mk
@@ -22,9 +22,10 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
ub-uiautomator \
ub-janktesthelper \
- legacy-android-test \
junit
+LOCAL_JAVA_LIBRARIES := legacy-android-test
+
LOCAL_SDK_VERSION := current
LOCAL_COMPATIBILITY_SUITE := device-tests
diff --git a/tests/jank/uibench/Android.mk b/tests/jank/uibench/Android.mk
index c12f3c3..14b5749 100644
--- a/tests/jank/uibench/Android.mk
+++ b/tests/jank/uibench/Android.mk
@@ -22,9 +22,10 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
ub-uiautomator \
ub-janktesthelper \
- legacy-android-test \
junit
+LOCAL_JAVA_LIBRARIES := legacy-android-test
+
LOCAL_SDK_VERSION := current
LOCAL_COMPATIBILITY_SUITE := device-tests
diff --git a/tests/jank/uibench_wear/Android.mk b/tests/jank/uibench_wear/Android.mk
index bcbe58d..6310569 100644
--- a/tests/jank/uibench_wear/Android.mk
+++ b/tests/jank/uibench_wear/Android.mk
@@ -22,9 +22,10 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
ub-uiautomator \
ub-janktesthelper \
- legacy-android-test \
junit
+LOCAL_JAVA_LIBRARIES := legacy-android-test
+
LOCAL_SDK_VERSION := current
LOCAL_COMPATIBILITY_SUITE := device-tests
diff --git a/tests/perf/PerfTransitionTest/Android.mk b/tests/perf/PerfTransitionTest/Android.mk
index 7e4b20a..8cac0dd 100644
--- a/tests/perf/PerfTransitionTest/Android.mk
+++ b/tests/perf/PerfTransitionTest/Android.mk
@@ -22,10 +22,8 @@
LOCAL_PACKAGE_NAME := AppTransitionTests
LOCAL_CERTIFICATE := platform
-LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \
- legacy-android-test \
ub-uiautomator \
launcher-helper-lib \
sysui-helper
diff --git a/tests/perf/PerformanceAppTest/Android.mk b/tests/perf/PerformanceAppTest/Android.mk
index 6c87256..54882f9 100644
--- a/tests/perf/PerformanceAppTest/Android.mk
+++ b/tests/perf/PerformanceAppTest/Android.mk
@@ -22,8 +22,8 @@
LOCAL_PACKAGE_NAME := PerformanceAppTest
LOCAL_CERTIFICATE := platform
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test legacy-android-test
+LOCAL_JAVA_LIBRARIES := legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
LOCAL_COMPATIBILITY_SUITE := device-tests
diff --git a/tests/perf/PowerPerfTest/Android.mk b/tests/perf/PowerPerfTest/Android.mk
index d9d6a4b..b3af570 100644
--- a/tests/perf/PowerPerfTest/Android.mk
+++ b/tests/perf/PowerPerfTest/Android.mk
@@ -18,6 +18,7 @@
LOCAL_PACKAGE_NAME := PowerPerfTest
LOCAL_MODULE_TAGS := tests
LOCAL_STATIC_JAVA_LIBRARIES := PowerTestHelper-src ub-uiautomator junit
+LOCAL_JAVA_LIBRARIES := legacy-android-test
LOCAL_CERTIFICATE := platform
LOCAL_SRC_FILES := $(call all-subdir-java-files)
diff --git a/utils/permissions/Android.mk b/utils/permissions/Android.mk
index d14a26b..0d86dd5 100644
--- a/utils/permissions/Android.mk
+++ b/utils/permissions/Android.mk
@@ -30,7 +30,6 @@
LOCAL_PACKAGE_NAME := PermissionUtils
LOCAL_MODULE_TAGS := tests
-LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_CERTIFICATE := platform
