Work on issue #17011123: Hit Back/Recents button when in Recents...
...without interacting with any of the Recents items should not bring
Home back to top
Up navigation needs to be smarter about multi-document and in the case
of being at the root of a document know to re-construct a task for
the app.
Change-Id: Ief874e46e9a9897379dda1010bcce4c5b03d82f1
diff --git a/core/java/android/app/ActivityManagerNative.java b/core/java/android/app/ActivityManagerNative.java
index 3dafa4b..5b81cc3 100644
--- a/core/java/android/app/ActivityManagerNative.java
+++ b/core/java/android/app/ActivityManagerNative.java
@@ -1997,11 +1997,11 @@
return true;
}
- case TARGET_TASK_AFFINITY_MATCHES_ACTIVITY_TRANSACTION: {
+ case SHOULD_UP_RECREATE_TASK_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
IBinder token = data.readStrongBinder();
String destAffinity = data.readString();
- boolean res = targetTaskAffinityMatchesActivity(token, destAffinity);
+ boolean res = shouldUpRecreateTask(token, destAffinity);
reply.writeNoException();
reply.writeInt(res ? 1 : 0);
return true;
@@ -4858,14 +4858,14 @@
reply.recycle();
}
- public boolean targetTaskAffinityMatchesActivity(IBinder token, String destAffinity)
+ public boolean shouldUpRecreateTask(IBinder token, String destAffinity)
throws RemoteException {
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
data.writeInterfaceToken(IActivityManager.descriptor);
data.writeStrongBinder(token);
data.writeString(destAffinity);
- mRemote.transact(TARGET_TASK_AFFINITY_MATCHES_ACTIVITY_TRANSACTION, data, reply, 0);
+ mRemote.transact(SHOULD_UP_RECREATE_TASK_TRANSACTION, data, reply, 0);
reply.readException();
boolean result = reply.readInt() != 0;
data.recycle();