Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I01d6cf719f3c9df4de2370b9b6af801399588c67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Riddle Hsu
2023-02-03 12:22:14 +00:00
committed by Automerger Merge Worker
parent 7fe8fe24d4 90b8a49013
commit 51a6e41426
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/DisplayContent.java
View File

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