diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/DisplayContent.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 49ceefe99d43..71a7e2657b4f 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 @@ 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; |