From 7b9ff958e513faa32071f5de691e50a73ffd3d51 Mon Sep 17 00:00:00 2001
From: lpeter <lpeter@google.com>
Date: Thu, 22 Sep 2022 04:32:40 +0800
Subject: [PATCH] Add @TestApi for the methods of
 VoiceInteractionSession.ActivityId

In order to verify which activity has become visible or
invisible, we need to add @TestApi for the methods of
VoiceInteractionSession.ActivityId class to get activity
data.

Bug: 246456675
Bug: 235296082
Test: atest VoiceInteractionSessionVisibleActivityTest
Change-Id: Ic659f23b7681a91d070cc841c8f7503b84b78092
---
 core/api/test-current.txt                                | 5 +++++
 .../android/service/voice/VoiceInteractionSession.java   | 9 +++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/core/api/test-current.txt b/core/api/test-current.txt
index e08cef92fc6c6..c8b54925db49e 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -2481,6 +2481,11 @@ package android.service.voice {
     ctor public VisibleActivityInfo(int, @NonNull android.os.IBinder);
   }
 
+  public static class VoiceInteractionSession.ActivityId {
+    method @NonNull public android.os.IBinder getAssistToken();
+    method public int getTaskId();
+  }
+
 }
 
 package android.service.watchdog {
diff --git a/core/java/android/service/voice/VoiceInteractionSession.java b/core/java/android/service/voice/VoiceInteractionSession.java
index fc47778ea5080..2c702299cf92e 100644
--- a/core/java/android/service/voice/VoiceInteractionSession.java
+++ b/core/java/android/service/voice/VoiceInteractionSession.java
@@ -24,6 +24,7 @@ import android.annotation.IntDef;
 import android.annotation.IntRange;
 import android.annotation.NonNull;
 import android.annotation.Nullable;
+import android.annotation.TestApi;
 import android.app.Activity;
 import android.app.Dialog;
 import android.app.DirectAction;
@@ -2311,11 +2312,15 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
             mAssistToken = assistToken;
         }
 
-        int getTaskId() {
+        /** @hide */
+        @TestApi
+        public int getTaskId() {
             return mTaskId;
         }
 
-        IBinder getAssistToken() {
+        /** @hide */
+        @TestApi
+        @NonNull public IBinder getAssistToken() {
             return mAssistToken;
         }