Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 133e2db8 authored by Bjorn Bringert's avatar Bjorn Bringert Committed by Android (Google) Code Review
Browse files

Merge "Hide VOICE_ASSIST intent DO NOT MERGE" into jb-mr2-dev

parents 86277467 964e7d25

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -5919,7 +5919,6 @@ package android.content { 
    field public static final java.lang.String ACTION_USER_INITIALIZE = "android.intent.action.USER_INITIALIZE";

    field public static final java.lang.String ACTION_USER_PRESENT = "android.intent.action.USER_PRESENT";

    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";

core/java/android/content/Intent.java

+3 −2
Original line number Diff line number Diff line
@@ -1164,12 +1164,13 @@ public class Intent implements Parcelable, Cloneable { 
     * additional optional contextual information about where the user was when they requested

     * the voice assist.

     * Output: nothing.

     * @hide

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_VOICE_ASSIST = "android.intent.action.VOICE_ASSIST";



    /**

     * An optional field on {@link #ACTION_ASSIST} and {@link #ACTION_VOICE_ASSIST}

     * An optional field on {@link #ACTION_ASSIST}

     * containing the name of the current foreground application package at the time

     * the assist was invoked.

     */
@@ -1177,7 +1178,7 @@ public class Intent implements Parcelable, Cloneable { 
            = "android.intent.extra.ASSIST_PACKAGE";



    /**

     * An optional field on {@link #ACTION_ASSIST} and {@link #ACTION_VOICE_ASSIST}

     * An optional field on {@link #ACTION_ASSIST}

     * containing additional contextual information supplied by the current

     * foreground app at the time of the assist request.  This is a {@link Bundle} of

     * additional data.