From 3d5ae5c4917e9210a5ece7fb4878b758470dc4a2 Mon Sep 17 00:00:00 2001
From: Ahaan Ugale <augale@google.com>
Date: Sun, 17 Jan 2021 17:02:44 -0800
Subject: [PATCH] VoiceInteraction: Add TEST_MAPPINGs.

Removes an unused constant in VoiceInteractor to test it.

Test: check the presubmits
Change-Id: I815eff582b130a533f0df5c8f10938009de9c65a
---
 core/java/android/app/TEST_MAPPING           |  9 +++++++++
 core/java/android/app/VoiceInteractor.java   |  3 ---
 core/java/android/service/voice/TEST_MAPPING |  7 +++++++
 services/voiceinteraction/TEST_MAPPING       | 12 ++++++++++++
 4 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 core/java/android/service/voice/TEST_MAPPING
 create mode 100644 services/voiceinteraction/TEST_MAPPING

diff --git a/core/java/android/app/TEST_MAPPING b/core/java/android/app/TEST_MAPPING
index 61e93f73b0943..23fc6f3bc72a1 100644
--- a/core/java/android/app/TEST_MAPPING
+++ b/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": [
diff --git a/core/java/android/app/VoiceInteractor.java b/core/java/android/app/VoiceInteractor.java
index c262ec2bf0099..433b275d4759c 100644
--- a/core/java/android/app/VoiceInteractor.java
+++ b/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;
 
diff --git a/core/java/android/service/voice/TEST_MAPPING b/core/java/android/service/voice/TEST_MAPPING
new file mode 100644
index 0000000000000..33a41c9723862
--- /dev/null
+++ b/core/java/android/service/voice/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "imports": [
+    {
+      "path": "frameworks/base/services/voiceinteraction"
+    }
+  ]
+}
diff --git a/services/voiceinteraction/TEST_MAPPING b/services/voiceinteraction/TEST_MAPPING
new file mode 100644
index 0000000000000..748e5dfe4e917
--- /dev/null
+++ b/services/voiceinteraction/TEST_MAPPING
@@ -0,0 +1,12 @@
+{
+  "presubmit-large": [
+    {
+      "name": "CtsVoiceInteractionTestCases",
+      "options": [
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    }
+  ]
+}