summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/com/android/internal/policy/PhoneWindow.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/com/android/internal/policy/PhoneWindow.java b/core/java/com/android/internal/policy/PhoneWindow.java
index 2e4d9b50b7be..41c92576ffea 100644
--- a/core/java/com/android/internal/policy/PhoneWindow.java
+++ b/core/java/com/android/internal/policy/PhoneWindow.java
@@ -337,6 +337,10 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
mElevation = preservedWindow.getElevation();
mLoadEleveation = false;
mForceDecorInstall = true;
+ // If we're preserving window, carry over the app token from the preserved
+ // window, as we'll be skipping the addView in handleResumeActivity(), and
+ // the token will not be updated as for a new window.
+ getAttributes().token = preservedWindow.getAttributes().token;
}
}