summaryrefslogtreecommitdiff
path: root/core/tests/mockingcoretests
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2019-03-20 12:46:55 -0700
committerSvetoslav Ganov <svetoslavganov@google.com>2019-04-26 00:39:53 +0000
commit70db79ab0f615018bf2c7984efac807ce7367677 (patch)
tree55dab99943500ee9ee937c8f0115832e51ba12fe /core/tests/mockingcoretests
parent1e05f0690888c02e5979c454019368ed6db0d8cd (diff)
Adding API for defining and invoking DirectActions
DirectActions are abstract actions defined by an Activtiy. The actual definition of these actions will be available through the support lib. This API provides a secure channel for system or assistant to interact with a running app using these Actions. Test: atest CtsVoiceInteractionTestCases Test: added android.voiceinteraction.cts.DirectActionsTest Bug: 129705716 Exempt-From-Owner-Approval: Resolving merge conflict Change-Id: I0ce568e0d8f41e0fe46306052016a74c7b394efa (cherry picked from commit d40c345536c385ed511238deedc943644ef25100)
Diffstat (limited to 'core/tests/mockingcoretests')
-rw-r--r--core/tests/mockingcoretests/src/android/app/activity/ActivityThreadClientTest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/tests/mockingcoretests/src/android/app/activity/ActivityThreadClientTest.java b/core/tests/mockingcoretests/src/android/app/activity/ActivityThreadClientTest.java
index 86d55ea4f5c2..b3f6fdbd9b30 100644
--- a/core/tests/mockingcoretests/src/android/app/activity/ActivityThreadClientTest.java
+++ b/core/tests/mockingcoretests/src/android/app/activity/ActivityThreadClientTest.java
@@ -347,7 +347,7 @@ public class ActivityThreadClientTest {
CompatibilityInfo.DEFAULT_COMPATIBILITY_INFO, null /* referrer */,
null /* voiceInteractor */, null /* state */, null /* persistentState */,
null /* pendingResults */, null /* pendingNewIntents */, true /* isForward */,
- null /* profilerInfo */, mThread /* client */);
+ null /* profilerInfo */, mThread /* client */, null /* asssitToken */);
}
@Override