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

Commit b0a999d0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not preserve window when window not added" into main am: 9c05e0e0 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3282749



Change-Id: I5f3db349bdbce622ab5e030802b5b8a63420fe97
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 375c94c9 9c05e0e0

core/java/android/app/ActivityThread.java

+1 −1
Original line number Diff line number Diff line
@@ -6188,7 +6188,7 @@ public final class ActivityThread extends ClientTransactionHandler 
        }



        r.activity.mConfigChangeFlags |= configChanges;

        r.mPreserveWindow = tmp.mPreserveWindow;

        r.mPreserveWindow = r.activity.mWindowAdded && tmp.mPreserveWindow;



        r.activity.mChangingConfigurations = true;