Don't take activity options that contain remote animation
Because the client doesn't need it and it only disables the
animation WM would run in this case. The issue is that if client
is faster in onStart than the other app with pausing itself, the
client wins and then we can't apply the animations anymore.
Also add some more logging if debug logging is enabled.
Test: ActivityRecordTests
Test: Swipe home, reopen other hot app quickly
Bug: 131775822
Change-Id: Ibf7d27de365ad23721c99aeb5c5f2f884b428eb6
diff --git a/services/core/java/com/android/server/wm/TaskRecord.java b/services/core/java/com/android/server/wm/TaskRecord.java
index 8505ec2..298b302 100644
--- a/services/core/java/com/android/server/wm/TaskRecord.java
+++ b/services/core/java/com/android/server/wm/TaskRecord.java
@@ -1493,7 +1493,7 @@
if (r.finishing) {
continue;
}
- ActivityOptions opts = r.takeOptionsLocked();
+ ActivityOptions opts = r.takeOptionsLocked(false /* fromClient */);
if (opts != null) {
ret.updateOptionsLocked(opts);
}