summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author jiayuzhou <jiayuzhou@google.com> 2018-08-17 13:17:46 -0700
committer jiayuzhou <jiayuzhou@google.com> 2018-09-19 18:03:41 -0700
commitf9f565cee764de6b90fd2f432aa371949e83efb8 (patch)
treefff78c0aa280889720425bb76d67bb601f19a68f
parent35339498efea47280cd247a13c81cbc9780768bd (diff)
Add SHOW_SOURCE_NOTIFICATION to indicate that the interaction service
was invoked by a notification. Bug: 112723657. Test: build the AOSP without issue. Change-Id: I9f372694b264bab97ef72eb22a39136d10a36090
-rwxr-xr-xapi/current.txt1
-rw-r--r--core/java/android/service/voice/VoiceInteractionSession.java6
2 files changed, 7 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 6042b2fa4c32..60b061c30a2d 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -39991,6 +39991,7 @@ package android.service.voice {
field public static final int SHOW_SOURCE_ACTIVITY = 16; // 0x10
field public static final int SHOW_SOURCE_APPLICATION = 8; // 0x8
field public static final int SHOW_SOURCE_ASSIST_GESTURE = 4; // 0x4
+ field public static final int SHOW_SOURCE_NOTIFICATION = 64; // 0x40
field public static final int SHOW_SOURCE_PUSH_TO_TALK = 32; // 0x20
field public static final int SHOW_WITH_ASSIST = 1; // 0x1
field public static final int SHOW_WITH_SCREENSHOT = 2; // 0x2
diff --git a/core/java/android/service/voice/VoiceInteractionSession.java b/core/java/android/service/voice/VoiceInteractionSession.java
index 26223f7bc6cd..163e3d5fab56 100644
--- a/core/java/android/service/voice/VoiceInteractionSession.java
+++ b/core/java/android/service/voice/VoiceInteractionSession.java
@@ -115,6 +115,12 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
*/
public static final int SHOW_SOURCE_PUSH_TO_TALK = 1 << 5;
+ /**
+ * Flag for use with {@link #onShow}: indicates that the voice interaction service was invoked
+ * from a notification.
+ */
+ public static final int SHOW_SOURCE_NOTIFICATION = 1 << 6;
+
final Context mContext;
final HandlerCaller mHandlerCaller;