Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdb5d2f7 authored by Chong Zhang's avatar Chong Zhang Committed by Android (Google) Code Review
Browse files

Merge "Carry over app token when preserving window"

parents 57bbbaca a8be1b99

core/java/com/android/internal/policy/PhoneWindow.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -337,6 +337,10 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
            mElevation = preservedWindow.getElevation();

            mElevation = preservedWindow.getElevation();

            mLoadEleveation = false;

            mLoadEleveation = false;

            mForceDecorInstall = true;

            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;

        }

        }

    }

    }