diff options
| author | 2022-05-05 02:19:24 +0000 | |
|---|---|---|
| committer | 2022-05-05 02:19:24 +0000 | |
| commit | cdf11f043ab6c1cea3bf8b9b2c1747d6a6e6c470 (patch) | |
| tree | d77fb4b2dda74bf0a6bf407437f1d611362a516a | |
| parent | 80b3d2834ab2471a1aca282ef0cce74c5849d6e6 (diff) | |
| parent | 5cdd3ce880c4cfeba8976ec571b9da2215ec23f8 (diff) | |
Merge "Re-enable the removed-from-presubmit hotword tests (framework part)" into tm-dev am: 5ab99b0a21 am: 5cdd3ce880
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18156226
Change-Id: Idb5a8f206355140f44c1d52185b7ee223fbde4fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/app/TEST_MAPPING | 13 | ||||
| -rw-r--r-- | services/voiceinteraction/TEST_MAPPING | 13 |
2 files changed, 0 insertions, 26 deletions
diff --git a/core/java/android/app/TEST_MAPPING b/core/java/android/app/TEST_MAPPING index a8ae1913b964..32207af22dc1 100644 --- a/core/java/android/app/TEST_MAPPING +++ b/core/java/android/app/TEST_MAPPING @@ -110,19 +110,6 @@ "options": [ { "exclude-annotation": "androidx.test.filters.FlakyTest" - }, - // TODO(b/225076204): Remove the following four test cases after fixing the test fail. - { - "exclude-filter": "android.voiceinteraction.cts.HotwordDetectionServiceBasicTest#testHotwordDetectionService_createDetectorTwiceQuickly_triggerSuccess" - }, - { - "exclude-filter": "android.voiceinteraction.cts.HotwordDetectionServiceBasicTest#testHotwordDetectionService_onDetectFromExternalSource_success" - }, - { - "exclude-filter": "android.voiceinteraction.cts.HotwordDetectionServiceBasicTest#testHotwordDetectionService_createDetectorTwiceQuickly_triggerSuccess" - }, - { - "exclude-filter": "android.voiceinteraction.cts.HotwordDetectionServiceBasicTest#testHotwordDetectionService_onDetectFromMic_success" } ], "file_patterns": ["(/|^)VoiceInteract[^/]*"] diff --git a/services/voiceinteraction/TEST_MAPPING b/services/voiceinteraction/TEST_MAPPING index bc8c639df1c1..22a6445843a4 100644 --- a/services/voiceinteraction/TEST_MAPPING +++ b/services/voiceinteraction/TEST_MAPPING @@ -5,19 +5,6 @@ "options": [ { "exclude-annotation": "androidx.test.filters.FlakyTest" - }, - // TODO(b/225076204): Remove the following four test cases after fixing the test fail. - { - "exclude-filter": "android.voiceinteraction.cts.HotwordDetectionServiceBasicTest#testHotwordDetectionService_createDetectorTwiceQuickly_triggerSuccess" - }, - { - "exclude-filter": "android.voiceinteraction.cts.HotwordDetectionServiceBasicTest#testHotwordDetectionService_onDetectFromExternalSource_success" - }, - { - "exclude-filter": "android.voiceinteraction.cts.HotwordDetectionServiceBasicTest#testHotwordDetectionService_createDetectorTwiceQuickly_triggerSuccess" - }, - { - "exclude-filter": "android.voiceinteraction.cts.HotwordDetectionServiceBasicTest#testHotwordDetectionService_onDetectFromMic_success" } ] }, |