| commit | 51a6e41426302015bf6af6e04e73442fc5ff2cba | [log] [tgz] |
|---|---|---|
| author | Riddle Hsu <riddlehsu@google.com> | Fri Feb 03 12:22:14 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 03 12:22:14 2023 +0000 |
| tree | bc0606f79874cee3f849d4c191d74eacaaea5146 | |
| parent | 7fe8fe24d4f4876c435625f5cfd9d6e910673f5c [diff] | |
| parent | 90b8a49013aa2a56d6a1db51e5301471bc575105 [diff] |
Merge "Check null for top activity when updating orientation" into tm-qpr-dev am: fc18585969 am: 90b8a49013 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>
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index faed11b..d93a62d 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -1732,7 +1732,7 @@ } // 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;