commit 5d41bd2973c63b997da1dc4cc7ef53cdad9a5c66
author Yuzhou Jia <jiayuzhou@google.com> Tue Sep 25 03:30:04 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 25 03:30:04 2018 +0000
tree 9bea7bdeb61d03b98b8a91dc93bd3ee4f1f1f3f7
parent d4b68f5e217275d5aaaa96bf41bda3c64901e783
parent f9f565cee764de6b90fd2f432aa371949e83efb8

Merge "Add SHOW_SOURCE_NOTIFICATION to indicate that the interaction service was invoked by a notification."

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 210f956..c1c8d78 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -40106,6 +40106,7 @@
     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

core/java/android/service/voice/VoiceInteractionSession.java

diff --git a/core/java/android/service/voice/VoiceInteractionSession.java b/core/java/android/service/voice/VoiceInteractionSession.java
index 26223f7..163e3d5 100644
--- a/core/java/android/service/voice/VoiceInteractionSession.java
+++ b/core/java/android/service/voice/VoiceInteractionSession.java
@@ -115,6 +115,12 @@
      */
     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;