summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jorim Jaggi <jjaggi@google.com> 2018-04-06 15:31:21 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-04-06 15:31:21 +0000
commitaec427ba1be87a1a19f5520a37a01bca938763d3 (patch)
tree9ca02b29d1c6a96bb33e11d67575424ac0c9093e
parent6c624498bc75a95ab0feab929ab209260aa04e52 (diff)
parent90b3c471c90a563885720db5649a999499aa75db (diff)
Merge "Inherit packageName/windowAnimations on TaskSnapshotSurface" into pi-dev
-rw-r--r--services/core/java/com/android/server/wm/TaskSnapshotSurface.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/TaskSnapshotSurface.java b/services/core/java/com/android/server/wm/TaskSnapshotSurface.java
index a9e53a14a210..597b39eaf826 100644
--- a/services/core/java/com/android/server/wm/TaskSnapshotSurface.java
+++ b/services/core/java/com/android/server/wm/TaskSnapshotSurface.java
@@ -173,6 +173,8 @@ class TaskSnapshotSurface implements StartingSurface {
windowFlags = topFullscreenWindow.getAttrs().flags;
windowPrivateFlags = topFullscreenWindow.getAttrs().privateFlags;
+ layoutParams.packageName = mainWindow.getAttrs().packageName;
+ layoutParams.windowAnimations = mainWindow.getAttrs().windowAnimations;
layoutParams.dimAmount = mainWindow.getAttrs().dimAmount;
layoutParams.type = TYPE_APPLICATION_STARTING;
layoutParams.format = snapshot.getSnapshot().getFormat();