Fix issue #22124996: VI: Command Request not Active

Just forgot to add the request to the active set.

Also eradicate a bunch of old cruft that has been replaced
by the final APIs, and improve voice interaction test to
sit fully on top of the final APIs and have a test for
command request.

Change-Id: Ieff7a6165ebf2a4c5fb80c1ebd020511a2ae63ee

1 files changed, 7 insertions, 17 deletions

diff --git a/tests/Assist/src/com/android/test/assist/AssistInteractionSession.java b/tests/Assist/src/com/android/test/assist/AssistInteractionSession.java
index e4ea0bc1c31e..43f1e32c9409 100644
--- a/tests/Assist/src/com/android/test/assist/AssistInteractionSession.java
+++ b/tests/Assist/src/com/android/test/assist/AssistInteractionSession.java
@@ -52,28 +52,23 @@ public class AssistInteractionSession extends VoiceInteractionSession {
     }
 
     @Override
-    public void onConfirm(Caller caller,
-            Request request, CharSequence prompt, Bundle extras) {
-
+    public void onRequestConfirmation(ConfirmationRequest request) {
     }
 
     @Override
-    public void onPickOption(Caller caller,
-            Request request, CharSequence prompt,
-            VoiceInteractor.PickOptionRequest.Option[] options, Bundle extras) {
-
+    public void onRequestPickOption(PickOptionRequest request) {
     }
 
     @Override
-    public void onCommand(Caller caller,
-            Request request, String command, Bundle extras) {
-
+    public void onRequestCommand(CommandRequest request) {
     }
 
     @Override
-    public void onCreate(Bundle args) {
-        super.onCreate(args);
+    public void onCancelRequest(Request request) {
+    }
 
+    @Override
+    public void onCreate() {
         // Simulate slowness of Assist app
         try {
             Thread.sleep(1000);
@@ -83,11 +78,6 @@ public class AssistInteractionSession extends VoiceInteractionSession {
     }
 
     @Override
-    public void onCancel(Request request) {
-
-    }
-
-    @Override
     public View onCreateContentView() {
         View v = getLayoutInflater().inflate(R.layout.assist, null);
         mScrim = v.findViewById(R.id.scrim);