| commit | 90b8a49013aa2a56d6a1db51e5301471bc575105 | [log] [tgz] |
|---|---|---|
| author | Riddle Hsu <riddlehsu@google.com> | Fri Feb 03 11:53:21 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 03 11:53:21 2023 +0000 |
| tree | a1345dbe11a06aa5297f6cb962809a7a18235562 | |
| parent | 2ecde879f74a9ea4b73c45c8fd6cb0cea6efddbf [diff] | |
| parent | fc185859690cc0b895a353bd4b0b8660c6960eaf [diff] |
Merge "Check null for top activity when updating orientation" into tm-qpr-dev am: fc18585969 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21218459 Change-Id: I3b56427fb7440bece3679af07cbe8a517893d5dd 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 49ceefe..71a7e26 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -1679,7 +1679,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;