diff --git a/Android.mk b/Android.mk index dbcc97b065a66883123c667957d8fd4b9d34faf5..4251262c24a491587259cad9c692e7e07c4fb7ae 100644 --- a/Android.mk +++ b/Android.mk @@ -14,7 +14,6 @@ # limitations under the License. # -include cts/suite/pts/PtsBenchmarkingList.mk include cts/CtsBuild.mk include cts/CtsCoverage.mk include $(call all-subdir-makefiles) diff --git a/CtsTestCaseList.mk b/CtsTestCaseList.mk index 5d23eb5916888f15c37fe3ce975a7e16d2ae067c..dab7b67605181690e9bc402120577b06f3853f14 100644 --- a/CtsTestCaseList.mk +++ b/CtsTestCaseList.mk @@ -30,18 +30,22 @@ cts_security_apps_list := \ CtsMultiUserStorageApp cts_support_packages := \ - $(PTS_SUPPORT_PACKAGES) \ - CtsAccelerationTestStubs \ - CtsDeviceAdmin \ - CtsMonkeyApp \ - CtsMonkeyApp2 \ - CtsSomeAccessibilityServices \ - CtsTestStubs \ - SignatureTest \ - TestDeviceSetup \ - CtsUiAutomatorApp \ - CtsUsbSerialTestApp \ - $(cts_security_apps_list) + CtsDeviceOpenGl \ + CtsDeviceTaskswitchingAppA \ + CtsDeviceTaskswitchingAppB \ + CtsDeviceTaskswitchingControl \ + CtsDeviceUi \ + CtsAccelerationTestStubs \ + CtsDeviceAdmin \ + CtsMonkeyApp \ + CtsMonkeyApp2 \ + CtsSomeAccessibilityServices \ + CtsTestStubs \ + SignatureTest \ + TestDeviceSetup \ + CtsUiAutomatorApp \ + CtsUsbSerialTestApp \ + $(cts_security_apps_list) cts_external_packages := \ com.replica.replicaisland @@ -54,60 +58,66 @@ CTS_TEST_CASE_LIST := \ # Test packages that require an associated test package XML. cts_test_packages := \ - $(PTS_TEST_PACKAGES) \ - CtsAccelerationTestCases \ - CtsAccountManagerTestCases \ - CtsAccessibilityServiceTestCases \ - CtsAccessibilityTestCases \ - CtsAdminTestCases \ - CtsAnimationTestCases \ - CtsAppTestCases \ - CtsBluetoothTestCases \ - CtsCalendarcommon2TestCases \ - CtsContentTestCases \ - CtsDatabaseTestCases \ - CtsDisplayTestCases \ - CtsDpiTestCases \ - CtsDpiTestCases2 \ - CtsDreamsTestCases \ - CtsDrmTestCases \ - CtsEffectTestCases \ - CtsExampleTestCases \ - CtsGestureTestCases \ - CtsGraphicsTestCases \ - CtsGraphics2TestCases \ - CtsHardwareTestCases \ - CtsHoloTestCases \ - CtsJniTestCases \ - CtsKeystoreTestCases \ - CtsLocationTestCases \ - CtsMediaStressTestCases \ - CtsMediaTestCases \ - CtsNativeOpenGLTestCases \ - CtsNdefTestCases \ - CtsNetTestCases \ - CtsOpenGLTestCases \ - CtsOpenGlPerfTestCases \ - CtsOsTestCases \ - CtsPermissionTestCases \ - CtsPermission2TestCases \ - CtsPreferenceTestCases \ - CtsPreference2TestCases \ - CtsProviderTestCases \ - CtsRenderscriptTestCases \ - CtsRenderscriptGraphicsTestCases \ - CtsRsCppTestCases \ - CtsSaxTestCases \ - CtsSecurityTestCases \ - CtsSpeechTestCases \ - CtsTelephonyTestCases \ - CtsTextTestCases \ - CtsTextureViewTestCases \ - CtsThemeTestCases \ - CtsUtilTestCases \ - CtsViewTestCases \ - CtsWebkitTestCases \ - CtsWidgetTestCases + CtsDeviceFilePerf \ + CtsDeviceUi \ + CtsDeviceDram \ + CtsDeviceSimpleCpu \ + CtsDeviceBrowserBench \ + CtsDeviceVideoPerf \ + CtsDeviceOpenGl \ + CtsAccelerationTestCases \ + CtsAccountManagerTestCases \ + CtsAccessibilityServiceTestCases \ + CtsAccessibilityTestCases \ + CtsAdminTestCases \ + CtsAnimationTestCases \ + CtsAppTestCases \ + CtsBluetoothTestCases \ + CtsCalendarcommon2TestCases \ + CtsContentTestCases \ + CtsDatabaseTestCases \ + CtsDisplayTestCases \ + CtsDpiTestCases \ + CtsDpiTestCases2 \ + CtsDreamsTestCases \ + CtsDrmTestCases \ + CtsEffectTestCases \ + CtsExampleTestCases \ + CtsGestureTestCases \ + CtsGraphicsTestCases \ + CtsGraphics2TestCases \ + CtsHardwareTestCases \ + CtsHoloTestCases \ + CtsJniTestCases \ + CtsKeystoreTestCases \ + CtsLocationTestCases \ + CtsMediaStressTestCases \ + CtsMediaTestCases \ + CtsNativeOpenGLTestCases \ + CtsNdefTestCases \ + CtsNetTestCases \ + CtsOpenGLTestCases \ + CtsOpenGlPerfTestCases \ + CtsOsTestCases \ + CtsPermissionTestCases \ + CtsPermission2TestCases \ + CtsPreferenceTestCases \ + CtsPreference2TestCases \ + CtsProviderTestCases \ + CtsRenderscriptTestCases \ + CtsRenderscriptGraphicsTestCases \ + CtsRsCppTestCases \ + CtsSaxTestCases \ + CtsSecurityTestCases \ + CtsSpeechTestCases \ + CtsTelephonyTestCases \ + CtsTextTestCases \ + CtsTextureViewTestCases \ + CtsThemeTestCases \ + CtsUtilTestCases \ + CtsViewTestCases \ + CtsWebkitTestCases \ + CtsWidgetTestCases # All APKs that need to be scanned by the coverage utilities. CTS_COVERAGE_TEST_CASE_LIST := \ @@ -117,11 +127,12 @@ CTS_COVERAGE_TEST_CASE_LIST := \ # Host side only tests cts_host_libraries := \ - $(PTS_HOST_CASES) \ - CtsAdbTests \ - CtsAppSecurityTests \ - CtsMonkeyTestCases \ - CtsUsbTests + CtsHostUi \ + CtsHostJank \ + CtsAdbTests \ + CtsAppSecurityTests \ + CtsMonkeyTestCases \ + CtsUsbTests # Native test executables that need to have associated test XMLs. @@ -131,23 +142,26 @@ cts_native_exes := \ bionic-unit-tests-cts \ cts_ui_tests := \ - CtsUiAutomatorTests + CtsUiAutomatorTests + +cts_device_jars := \ + CtsDeviceJank # All the files that will end up under the repository/testcases # directory of the final CTS distribution. CTS_TEST_CASES := $(call cts-get-lib-paths,$(cts_host_libraries)) \ - $(call cts-get-package-paths,$(cts_test_packages)) \ - $(call cts-get-native-paths,$(cts_native_exes)) \ - $(call cts-get-ui-lib-paths,$(cts_ui_tests)) \ - $(call cts-get-ui-lib-paths,$(pts_device_lib_tests)) + $(call cts-get-package-paths,$(cts_test_packages)) \ + $(call cts-get-native-paths,$(cts_native_exes)) \ + $(call cts-get-ui-lib-paths,$(cts_ui_tests)) \ + $(call cts-get-ui-lib-paths,$(cts_device_jars)) # All the XMLs that will end up under the repository/testcases # and that need to be created before making the final CTS distribution. CTS_TEST_XMLS := $(call cts-get-test-xmls,$(cts_host_libraries)) \ - $(call cts-get-test-xmls,$(cts_test_packages)) \ - $(call cts-get-test-xmls,$(cts_native_exes)) \ - $(call cts-get-test-xmls,$(cts_ui_tests)) + $(call cts-get-test-xmls,$(cts_test_packages)) \ + $(call cts-get-test-xmls,$(cts_native_exes)) \ + $(call cts-get-test-xmls,$(cts_ui_tests)) # The following files will be placed in the tools directory of the CTS distribution -CTS_TOOLS_LIST := +CTS_TOOLS_LIST := \ No newline at end of file diff --git a/apps/CtsVerifier/Android.mk b/apps/CtsVerifier/Android.mk index 834320b19d183491d61aba12a5f4804cd9c83161..397b39abba8aae99e39706267dbe86e9001be271 100644 --- a/apps/CtsVerifier/Android.mk +++ b/apps/CtsVerifier/Android.mk @@ -23,6 +23,8 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_SRC_FILES := $(call all-java-files-under, src) +LOCAL_STATIC_JAVA_LIBRARIES := cts-sensors-tests + LOCAL_PACKAGE_NAME := CtsVerifier LOCAL_JNI_SHARED_LIBRARIES := libctsverifier_jni \ diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml index b9f7ceb450f1ea527c8be8dff20cd3771040eb1b..9a583ef30ca6964cd3865ab68a03bb86c095f45e 100644 --- a/apps/CtsVerifier/AndroidManifest.xml +++ b/apps/CtsVerifier/AndroidManifest.xml @@ -18,7 +18,7 @@ + android:versionName="4.4_r1"> @@ -76,7 +76,7 @@ android:configChanges="keyboardHidden|orientation|screenSize" android:label="@string/report_viewer" /> - + + + + + + @@ -275,6 +285,128 @@ android:label="@string/nfc_tag_verifier" android:configChanges="keyboardHidden|orientation|screenSize" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -285,6 +417,18 @@ + + + + + + + + + @@ -295,6 +439,31 @@ + + + + + + + + + + + + @@ -335,6 +504,7 @@ + @@ -371,6 +541,19 @@ android:label="@string/camera_fov_label_options" > + + + + + + + + + + @@ -392,7 +575,7 @@ - + @@ -410,8 +593,8 @@ - - + + diff --git a/apps/CtsVerifier/proguard.flags b/apps/CtsVerifier/proguard.flags index ddaf9626121fdc8d2c0c4ddb595b1eb008132770..dde9fdeef1d18d14cf09acba5d1d5f5dda723b2d 100644 --- a/apps/CtsVerifier/proguard.flags +++ b/apps/CtsVerifier/proguard.flags @@ -6,3 +6,5 @@ private ; } +-dontwarn android.hardware.Sensor +-dontwarn java.util.concurrent.ConcurrentLinkedDeque diff --git a/apps/CtsVerifier/res/layout/camera_video.xml b/apps/CtsVerifier/res/layout/camera_video.xml new file mode 100644 index 0000000000000000000000000000000000000000..b81721bae02bd7e6e88115ae91a94e945557d878 --- /dev/null +++ b/apps/CtsVerifier/res/layout/camera_video.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +