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

Commit 7140a25f authored by Adam Skory's avatar Adam Skory
Browse files

Revert services assist context in KitKat 

Reverts extension to assist context API to query
foreground services for assist context data.

Also hides Intent.ACTION_VOICE_ASSIST because
nobody's actually using it yet.

Bug: 10461702
Change-Id: Idf6836adc659b434e11ebb2b98e8b814c94a7227
parent e3d0f022

api/current.txt

+0 −6
Original line number Diff line number Diff line
@@ -845,7 +845,6 @@ package android { 
    field public static final int prompt = 16843131; // 0x101017b

    field public static final int propertyName = 16843489; // 0x10102e1

    field public static final int protectionLevel = 16842761; // 0x1010009

    field public static final int provideAssistData = 16843758; // 0x10103ee

    field public static final int publicKey = 16843686; // 0x10103a6

    field public static final int queryActionMsg = 16843227; // 0x10101db

    field public static final int queryAfterZeroResults = 16843394; // 0x1010282
@@ -4246,7 +4245,6 @@ package android.app { 
    method public void onCreate();

    method public void onDestroy();

    method public void onLowMemory();

    method public void onProvideAssistData(android.os.Bundle);

    method public void onRebind(android.content.Intent);

    method public deprecated void onStart(android.content.Intent, int);

    method public int onStartCommand(android.content.Intent, int, int);
@@ -6406,7 +6404,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";
@@ -6448,8 +6445,6 @@ 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_ASSIST_CONTEXT = "android.intent.extra.ASSIST_CONTEXT";

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

    field public static final java.lang.String EXTRA_ASSIST_SERVICES_CONTEXTS = "android.intent.extra.ASSIST_SERVICES_CONTEXTS";

    field public static final java.lang.String EXTRA_ASSIST_SERVICES_PACKAGES = "android.intent.extra.ASSIST_SERVICES_PACKAGES";

    field public static final java.lang.String EXTRA_BCC = "android.intent.extra.BCC";

    field public static final java.lang.String EXTRA_BUG_REPORT = "android.intent.extra.BUG_REPORT";

    field public static final java.lang.String EXTRA_CC = "android.intent.extra.CC";
@@ -7449,7 +7444,6 @@ package android.content.pm { 
    method public void dump(android.util.Printer, java.lang.String);

    field public static final android.os.Parcelable.Creator CREATOR;

    field public static final int FLAG_ISOLATED_PROCESS = 2; // 0x2

    field public static final int FLAG_PROVIDE_ASSIST_DATA = 4; // 0x4

    field public static final int FLAG_SINGLE_USER = 1073741824; // 0x40000000

    field public static final int FLAG_STOP_WITH_TASK = 1; // 0x1

    field public int flags;

core/java/android/app/ActivityManagerNative.java

+2 −4
Original line number Diff line number Diff line
@@ -1936,8 +1936,7 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            data.enforceInterface(IActivityManager.descriptor);

            IBinder token = data.readStrongBinder();

            Bundle extras = data.readBundle();

            int index = data.readInt();

            reportAssistContextExtras(token, extras, index);

            reportAssistContextExtras(token, extras);

            reply.writeNoException();

            return true;

        }
@@ -4489,14 +4488,13 @@ class ActivityManagerProxy implements IActivityManager 
        return res;

    }



    public void reportAssistContextExtras(IBinder token, Bundle extras, int index)

    public void reportAssistContextExtras(IBinder token, Bundle extras)

            throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

        data.writeStrongBinder(token);

        data.writeBundle(extras);

        data.writeInt(index);

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

        reply.readException();

        data.recycle();

core/java/android/app/ActivityThread.java

+2 −9
Original line number Diff line number Diff line
@@ -528,7 +528,6 @@ public final class ActivityThread { 
        IBinder activityToken;

        IBinder requestToken;

        int requestType;

        int index;

    }



    private native void dumpGraphicsInfo(FileDescriptor fd);
@@ -1194,12 +1193,11 @@ public final class ActivityThread { 


        @Override

        public void requestAssistContextExtras(IBinder activityToken, IBinder requestToken,

                int requestType, int index) {

                int requestType) {

            RequestAssistContextExtras cmd = new RequestAssistContextExtras();

            cmd.activityToken = activityToken;

            cmd.requestToken = requestToken;

            cmd.requestType = requestType;

            cmd.index = index;

            queueOrSendMessage(H.REQUEST_ASSIST_CONTEXT_EXTRAS, cmd);

        }
@@ -2278,18 +2276,13 @@ public final class ActivityThread { 
        if (r != null) {

            r.activity.getApplication().dispatchOnProvideAssistData(r.activity, data);

            r.activity.onProvideAssistData(data);

        } else {

            Service service = mServices.get(cmd.activityToken);

            if (service != null) {

                service.onProvideAssistData(data);

            }

        }

        if (data.isEmpty()) {

            data = null;

        }

        IActivityManager mgr = ActivityManagerNative.getDefault();

        try {

            mgr.reportAssistContextExtras(cmd.requestToken, data, cmd.index);

            mgr.reportAssistContextExtras(cmd.requestToken, data);

        } catch (RemoteException e) {

        }

    }

core/java/android/app/ApplicationThreadNative.java

+2 −4
Original line number Diff line number Diff line
@@ -606,8 +606,7 @@ public abstract class ApplicationThreadNative extends Binder 
            IBinder activityToken = data.readStrongBinder();

            IBinder requestToken = data.readStrongBinder();

            int requestType = data.readInt();

            int index = data.readInt();

            requestAssistContextExtras(activityToken, requestToken, requestType, index);

            requestAssistContextExtras(activityToken, requestToken, requestType);

            reply.writeNoException();

            return true;

        }
@@ -1243,13 +1242,12 @@ class ApplicationThreadProxy implements IApplicationThread { 


    @Override

    public void requestAssistContextExtras(IBinder activityToken, IBinder requestToken,

            int requestType, int index) throws RemoteException {

            int requestType) throws RemoteException {

        Parcel data = Parcel.obtain();

        data.writeInterfaceToken(IApplicationThread.descriptor);

        data.writeStrongBinder(activityToken);

        data.writeStrongBinder(requestToken);

        data.writeInt(requestType);

        data.writeInt(index);

        mRemote.transact(REQUEST_ASSIST_CONTEXT_EXTRAS_TRANSACTION, data, null,

                IBinder.FLAG_ONEWAY);

        data.recycle();

core/java/android/app/IActivityManager.java

+1 −2
Original line number Diff line number Diff line
@@ -388,8 +388,7 @@ public interface IActivityManager extends IInterface { 


    public Bundle getAssistContextExtras(int requestType) throws RemoteException;



    public void reportAssistContextExtras(IBinder token, Bundle extras, int index)

            throws RemoteException;

    public void reportAssistContextExtras(IBinder token, Bundle extras) throws RemoteException;



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