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

Commit 91bf1278 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 581feb87: am 90ac517c: Create API for launching from recents 

* commit '581feb87f8a0bcfd14b2b28fd9f06f4e162f10b6':
  Create API for launching from recents
parents d4da3853 92d0636a

core/java/android/app/ActivityManagerNative.java

+29 −0
Original line number Diff line number Diff line
@@ -284,6 +284,17 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            return true;

        }



        case START_ACTIVITY_FROM_RECENTS_TRANSACTION:

        {

            data.enforceInterface(IActivityManager.descriptor);

            int taskId = data.readInt();

            Bundle options = data.readInt() == 0 ? null : Bundle.CREATOR.createFromParcel(data);

            int result = startActivityFromRecents(taskId, options);

            reply.writeNoException();

            reply.writeInt(result);

            return true;

        }



        case FINISH_ACTIVITY_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            IBinder token = data.readStrongBinder();
@@ -2482,6 +2493,24 @@ class ActivityManagerProxy implements IActivityManager 
        data.recycle();

        return result != 0;

    }

    public int startActivityFromRecents(int taskId, Bundle options) throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

        data.writeInt(taskId);

        if (options == null) {

            data.writeInt(0);

        } else {

            data.writeInt(1);

            options.writeToParcel(data, 0);

        }

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

        reply.readException();

        int result = reply.readInt();

        reply.recycle();

        data.recycle();

        return result;

    }

    public boolean finishActivity(IBinder token, int resultCode, Intent resultData, boolean finishTask)

            throws RemoteException {

        Parcel data = Parcel.obtain();

core/java/android/app/IActivityManager.java

+2 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ public interface IActivityManager extends IInterface { 
            ParcelFileDescriptor profileFd, Bundle options, int userId) throws RemoteException;

    public boolean startNextMatchingActivity(IBinder callingActivity,

            Intent intent, Bundle options) throws RemoteException;

    public int startActivityFromRecents(int taskId, Bundle options) throws RemoteException;

    public boolean finishActivity(IBinder token, int code, Intent data, boolean finishTask)

            throws RemoteException;

    public void finishSubActivity(IBinder token, String resultWho, int requestCode) throws RemoteException;
@@ -756,4 +757,5 @@ public interface IActivityManager extends IInterface { 
    int IS_BG_MEDIA_PLAYING_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+226;

    int MEDIA_RESOURCES_RELEASED_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+227;

    int NOTIFY_LAUNCH_TASK_BEHIND_COMPLETE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+228;

    int START_ACTIVITY_FROM_RECENTS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 229;

}

core/res/AndroidManifest.xml

+8 −0
Original line number Diff line number Diff line
@@ -1364,6 +1364,14 @@ 
        android:label="@string/permlab_getTasks"

        android:description="@string/permdesc_getTasks" />



    <!-- Allows an application to start a task from a ActivityManager#RecentTaskInfo.

         @hide -->

    <permission android:name="android.permission.START_TASKS_FROM_RECENTS"

        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"

        android:protectionLevel="signature|system"

        android:label="@string/permlab_startTasksFromRecents"

        android:description="@string/permdesc_startTasksFromRecents" />



    <!-- @SystemApi @hide Allows an application to call APIs that allow it to do interactions

         across the users on the device, using singleton services and

         user-targeted broadcasts.  This permission is not available to

core/res/res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -774,6 +774,12 @@ 
       about currently and recently running tasks.  This may allow the app to

       discover information about which applications are used on the device.</string>



    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permlab_startTasksFromRecents">start a task from recents</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permdesc_startTasksFromRecents">Allows the app to use an ActivityManager.RecentTaskInfo

        object to launch a defunct task that was returned from ActivityManager.getRecentTaskList().</string>



    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=NONE] -->

    <string name="permlab_interactAcrossUsers">interact across users</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=NONE] -->

packages/SystemUI/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ 
    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />

    <uses-permission android:name="android.permission.GET_TOP_ACTIVITY_INFO" />

    <uses-permission android:name="android.permission.MANAGE_ACTIVITY_STACKS" />

    <uses-permission android:name="android.permission.START_TASKS_FROM_RECENTS" />



    <!-- WindowManager -->

    <uses-permission android:name="android.permission.INTERNAL_SYSTEM_WINDOW" />