Merge "VoiceInteraction: Add TEST_MAPPINGs."

core/java/android/app/TEST_MAPPING

@@ -105,6 +105,15 @@
             ],
             "file_patterns": ["(/|^)Activity.java"]
         },
+        {
+            "name": "CtsVoiceInteractionTestCases",
+            "options": [
+                {
+                    "exclude-annotation": "androidx.test.filters.FlakyTest"
+                }
+            ],
+            "file_patterns": ["(/|^)VoiceInteract[^/]*"]
+        },
         {
             "name": "CtsContentTestCases",
             "options": [

core/java/android/app/VoiceInteractor.java

@@ -37,7 +37,6 @@ import com.android.internal.app.IVoiceInteractorCallback;
 import com.android.internal.app.IVoiceInteractorRequest;
 import com.android.internal.os.HandlerCaller;
 import com.android.internal.os.SomeArgs;
-import com.android.internal.util.Preconditions;
 import com.android.internal.util.function.pooled.PooledLambda;
 
 import java.io.FileDescriptor;
@@ -77,8 +76,6 @@ public final class VoiceInteractor {
 
     /** @hide */
     public static final String KEY_CANCELLATION_SIGNAL = "key_cancellation_signal";
-    /** @hide */
-    public static final String KEY_KILL_SIGNAL = "key_kill_signal";
 
     @Nullable IVoiceInteractor mInteractor;
 

core/java/android/service/voice/TEST_MAPPING

@@ -0,0 +1,7 @@
+{
+ "imports": [
+    {
+      "path": "frameworks/base/services/voiceinteraction"
+    }
+  ]
+}

services/voiceinteraction/TEST_MAPPING

@@ -0,0 +1,12 @@
+{
+  "presubmit-large": [
+    {
+      "name": "CtsVoiceInteractionTestCases",
+      "options": [
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    }
+  ]
+}