summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/core/java/com/android/server/wm/Task.java6
-rw-r--r--services/core/java/com/android/server/wm/TaskFragment.java3
2 files changed, 2 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index 87e472ab7aa6..f090ef1b72e9 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -6292,12 +6292,6 @@ class Task extends TaskFragment {
return mAnimatingActivityRegistry;
}
- @Override
- void executeAppTransition(ActivityOptions options) {
- mDisplayContent.executeAppTransition();
- ActivityOptions.abort(options);
- }
-
private Rect getRawBounds() {
return super.getBounds();
}
diff --git a/services/core/java/com/android/server/wm/TaskFragment.java b/services/core/java/com/android/server/wm/TaskFragment.java
index e090b1980c6d..51b8bd1f0091 100644
--- a/services/core/java/com/android/server/wm/TaskFragment.java
+++ b/services/core/java/com/android/server/wm/TaskFragment.java
@@ -2129,7 +2129,8 @@ class TaskFragment extends WindowContainer<WindowContainer> {
}
void executeAppTransition(ActivityOptions options) {
- // No app transition applied to the task fragment.
+ mDisplayContent.executeAppTransition();
+ ActivityOptions.abort(options);
}
@Override