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

Commit 90b8a490 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 am: fc185859 

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



Change-Id: I3b56427fb7440bece3679af07cbe8a517893d5dd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2ecde879 fc185859

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

+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;