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

Commit 159f558a authored by Tim Kilbourn's avatar Tim Kilbourn Committed by Android (Google) Code Review
Browse files

Merge "Pass an args bundle to launchAssistAction." into mnc-dev

parents 20ac61b8 0e5f110f

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8288,6 +8288,7 @@ package android.content { 
    field public static final deprecated java.lang.String EXTRA_ALLOW_REPLACE = "android.intent.extra.ALLOW_REPLACE";

    field public static final java.lang.String EXTRA_ALTERNATE_INTENTS = "android.intent.extra.ALTERNATE_INTENTS";

    field public static final java.lang.String EXTRA_ASSIST_CONTEXT = "android.intent.extra.ASSIST_CONTEXT";

    field public static final java.lang.String EXTRA_ASSIST_INPUT_DEVICE_ID = "android.intent.extra.ASSIST_INPUT_DEVICE_ID";

    field public static final java.lang.String EXTRA_ASSIST_INPUT_HINT_KEYBOARD = "android.intent.extra.ASSIST_INPUT_HINT_KEYBOARD";

    field public static final java.lang.String EXTRA_ASSIST_PACKAGE = "android.intent.extra.ASSIST_PACKAGE";

    field public static final java.lang.String EXTRA_ASSIST_UID = "android.intent.extra.ASSIST_UID";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8520,6 +8520,7 @@ package android.content { 
    field public static final deprecated java.lang.String EXTRA_ALLOW_REPLACE = "android.intent.extra.ALLOW_REPLACE";

    field public static final java.lang.String EXTRA_ALTERNATE_INTENTS = "android.intent.extra.ALTERNATE_INTENTS";

    field public static final java.lang.String EXTRA_ASSIST_CONTEXT = "android.intent.extra.ASSIST_CONTEXT";

    field public static final java.lang.String EXTRA_ASSIST_INPUT_DEVICE_ID = "android.intent.extra.ASSIST_INPUT_DEVICE_ID";

    field public static final java.lang.String EXTRA_ASSIST_INPUT_HINT_KEYBOARD = "android.intent.extra.ASSIST_INPUT_HINT_KEYBOARD";

    field public static final java.lang.String EXTRA_ASSIST_PACKAGE = "android.intent.extra.ASSIST_PACKAGE";

    field public static final java.lang.String EXTRA_ASSIST_UID = "android.intent.extra.ASSIST_UID";

core/java/android/app/ActivityManagerNative.java

+5 −3
Original line number Diff line number Diff line
@@ -2208,7 +2208,8 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            int requestType = data.readInt();

            String hint = data.readString();

            int userHandle = data.readInt();

            boolean res = launchAssistIntent(intent, requestType, hint, userHandle);

            Bundle args = data.readBundle();

            boolean res = launchAssistIntent(intent, requestType, hint, userHandle, args);

            reply.writeNoException();

            reply.writeInt(res ? 1 : 0);

            return true;
@@ -5389,8 +5390,8 @@ class ActivityManagerProxy implements IActivityManager 
        reply.recycle();

    }



    public boolean launchAssistIntent(Intent intent, int requestType, String hint, int userHandle)

            throws RemoteException {

    public boolean launchAssistIntent(Intent intent, int requestType, String hint, int userHandle,

            Bundle args) throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);
@@ -5398,6 +5399,7 @@ class ActivityManagerProxy implements IActivityManager 
        data.writeInt(requestType);

        data.writeString(hint);

        data.writeInt(userHandle);

        data.writeBundle(args);

        mRemote.transact(LAUNCH_ASSIST_INTENT_TRANSACTION, data, reply, 0);

        reply.readException();

        boolean res = reply.readInt() != 0;

core/java/android/app/IActivityManager.java

+2 −2
Original line number Diff line number Diff line
@@ -438,8 +438,8 @@ public interface IActivityManager extends IInterface { 
    public void reportAssistContextExtras(IBinder token, Bundle extras,

            AssistStructure structure, AssistContent content) throws RemoteException;



    public boolean launchAssistIntent(Intent intent, int requestType, String hint, int userHandle)

            throws RemoteException;

    public boolean launchAssistIntent(Intent intent, int requestType, String hint, int userHandle,

            Bundle args) throws RemoteException;



    public void killUid(int uid, String reason) throws RemoteException;

core/java/android/app/ISearchManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -31,5 +31,5 @@ interface ISearchManager { 
   ComponentName getGlobalSearchActivity();

   ComponentName getWebSearchActivity();

   ComponentName getAssistIntent(int userHandle);

   boolean launchAssistAction(String hint, int userHandle);

   boolean launchAssistAction(String hint, int userHandle, in Bundle args);

}