Merge "Add @TestApi for the methods of VoiceInteractionSession.ActivityId" (c62b8283) · Commits · e / os / android_frameworks_base

core/api/test-current.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -2483,6 +2483,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 {

+7 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}