diff options
| author | 2017-03-03 23:58:16 +0000 | |
|---|---|---|
| committer | 2017-03-03 23:58:19 +0000 | |
| commit | 4992dbb6f7c20a258bc7a5174e9c9ad64b0d1927 (patch) | |
| tree | 24edb4d9a2a459b0b377898a99c56c2095162857 | |
| parent | 870c26af90ce97dffe15f97aff387732ad44033e (diff) | |
| parent | 1645203104735f0d429792769f6e262ca3ce72ee (diff) | |
Merge "Mark ACTION_VOICE_ASSIST as SystemApi"
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/Intent.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 0ffe31e33d83..234a2d667655 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9685,6 +9685,7 @@ package android.content { field public static final java.lang.String ACTION_USER_PRESENT = "android.intent.action.USER_PRESENT"; field public static final java.lang.String ACTION_USER_UNLOCKED = "android.intent.action.USER_UNLOCKED"; field public static final java.lang.String ACTION_VIEW = "android.intent.action.VIEW"; + field public static final java.lang.String ACTION_VOICE_ASSIST = "android.intent.action.VOICE_ASSIST"; field public static final java.lang.String ACTION_VOICE_COMMAND = "android.intent.action.VOICE_COMMAND"; field public static final deprecated java.lang.String ACTION_WALLPAPER_CHANGED = "android.intent.action.WALLPAPER_CHANGED"; field public static final java.lang.String ACTION_WEB_SEARCH = "android.intent.action.WEB_SEARCH"; diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 870db217003c..e0dc10daf64d 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -1324,6 +1324,7 @@ public class Intent implements Parcelable, Cloneable { * Output: nothing. * @hide */ + @SystemApi @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_VOICE_ASSIST = "android.intent.action.VOICE_ASSIST"; |