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

Commit 51a6e414 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Check null for top activity when updating orientation" into tm-qpr-dev... 

Merge "Check null for top activity when updating orientation" into tm-qpr-dev am: fc185859 am: 90b8a490

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



Change-Id: I01d6cf719f3c9df4de2370b9b6af801399588c67
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7fe8fe24 90b8a490

services/core/java/com/android/server/wm/DisplayContent.java

+1 −1
Original line number Diff line number Diff line
@@ -1732,7 +1732,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
            }

            // The orientation source may not be the top if it uses SCREEN_ORIENTATION_BEHIND.

            final ActivityRecord topCandidate = !r.isVisibleRequested() ? topRunningActivity() : r;

            if (handleTopActivityLaunchingInDifferentOrientation(

            if (topCandidate != null && handleTopActivityLaunchingInDifferentOrientation(

                    topCandidate, r, true /* checkOpening */)) {

                // Display orientation should be deferred until the top fixed rotation is finished.

                return false;