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

Commit 0e5f110f authored by Tim Kilbourn's avatar Tim Kilbourn
Browse files

Pass an args bundle to launchAssistAction. 

In order to track the input device that was used to trigger assist, the
input device id is sent as an extra in the assist intent whenever it is
available. This is particularly useful on TVs, when an app may want to
know whether the input device has a microphone.

Bug: 21666123
Change-Id: I0f8c09e2f617606bef481bdff924cb6b9b47dd12
parent 3e85c1ed

api/current.txt

+2 −1
Original line number Diff line number Diff line
@@ -8277,6 +8277,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";
@@ -24476,10 +24477,10 @@ package android.provider { 














  public final class AlarmClock {















    ctor public AlarmClock();













    field public static final java.lang.String ACTION_DISMISS_ALARM = "android.intent.action.DISMISS_ALARM";















    field public static final java.lang.String ACTION_SET_ALARM = "android.intent.action.SET_ALARM";















    field public static final java.lang.String ACTION_SET_TIMER = "android.intent.action.SET_TIMER";















    field public static final java.lang.String ACTION_SHOW_ALARMS = "android.intent.action.SHOW_ALARMS";













    field public static final java.lang.String ACTION_DISMISS_ALARM = "android.intent.action.DISMISS_ALARM";















    field public static final java.lang.String ACTION_SNOOZE_ALARM = "android.intent.action.SNOOZE_ALARM";















    field public static final java.lang.String ALARM_SEARCH_MODE_ALL = "android.all";















    field public static final java.lang.String ALARM_SEARCH_MODE_LABEL = "android.label";

























api/system-current.txt



+2
−1




























Original line number
Diff line number
Diff line








@@ -8509,6 +8509,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";










@@ -26406,10 +26407,10 @@ package android.provider {



























  public final class AlarmClock {















    ctor public AlarmClock();













    field public static final java.lang.String ACTION_DISMISS_ALARM = "android.intent.action.DISMISS_ALARM";















    field public static final java.lang.String ACTION_SET_ALARM = "android.intent.action.SET_ALARM";















    field public static final java.lang.String ACTION_SET_TIMER = "android.intent.action.SET_TIMER";















    field public static final java.lang.String ACTION_SHOW_ALARMS = "android.intent.action.SHOW_ALARMS";













    field public static final java.lang.String ACTION_DISMISS_ALARM = "android.intent.action.DISMISS_ALARM";















    field public static final java.lang.String ACTION_SNOOZE_ALARM = "android.intent.action.SNOOZE_ALARM";















    field public static final java.lang.String ALARM_SEARCH_MODE_ALL = "android.all";















    field public static final java.lang.String ALARM_SEARCH_MODE_LABEL = "android.label";

























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;










@@ -5378,8 +5379,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);









@@ -5387,6 +5388,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);















}