Support for specifying stack to launch an activity from recents in.
Bug: 24668831
Change-Id: Iebd019d3a566a6d068253d8f566c1df88e9e64dd
diff --git a/core/java/android/app/ActivityManagerNative.java b/core/java/android/app/ActivityManagerNative.java
index cb1a89f..42888cf 100644
--- a/core/java/android/app/ActivityManagerNative.java
+++ b/core/java/android/app/ActivityManagerNative.java
@@ -330,9 +330,11 @@
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);
+ final int taskId = data.readInt();
+ final int launchStackId = data.readInt();
+ final Bundle options =
+ data.readInt() == 0 ? null : Bundle.CREATOR.createFromParcel(data);
+ final int result = startActivityFromRecents(taskId, launchStackId, options);
reply.writeNoException();
reply.writeInt(result);
return true;
@@ -2984,11 +2986,13 @@
data.recycle();
return result != 0;
}
- public int startActivityFromRecents(int taskId, Bundle options) throws RemoteException {
+ public int startActivityFromRecents(int taskId, int launchStackId, Bundle options)
+ throws RemoteException {
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
data.writeInterfaceToken(IActivityManager.descriptor);
data.writeInt(taskId);
+ data.writeInt(launchStackId);
if (options == null) {
data.writeInt(0);
} else {