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

Commit fc185859 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

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

parents 3ef8a24a 33b07be4
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1679,7 +1679,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;