Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6ec39b2 authored by Joanne Chung's avatar Joanne Chung Committed by Automerger Merge Worker
Browse files

Merge "Re-enable the removed-from-presubmit hotword tests (framework part)"... 

Merge "Re-enable the removed-from-presubmit hotword tests (framework part)" into tm-dev am: 5ab99b0a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18156226



Change-Id: Ie2e223ad77aaa9f6d370bae2786a6afcd6f56afb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7b868081 5ab99b0a

core/java/android/app/TEST_MAPPING

+0 −13
Original line number Original line Diff line number Diff line
@@ -110,19 +110,6 @@ 
            "options": [

            "options": [

                {

                {

                    "exclude-annotation": "androidx.test.filters.FlakyTest"

                    "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[^/]*"]

            "file_patterns": ["(/|^)VoiceInteract[^/]*"]

services/voiceinteraction/TEST_MAPPING

+0 −13
Original line number Original line Diff line number Diff line
@@ -5,19 +5,6 @@ 
      "options": [

      "options": [

        {

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

          "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"

        }

        }

      ]

      ]

    },

    },