diff options
| author | Evan Rosky <erosky@google.com> | 2020-06-01 23:48:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-01 23:48:45 +0000 |
| commit | af08a6eefde8a2ba44da95e9699b77bb9881c3af (patch) | |
| tree | b14f63deb462e6baddad59265a251f5724472f2f /core/java/android/view/WindowlessWindowManager.java | |
| parent | 1d3d4af2f5ec00b3428f646bd526ec0dd9dd1d37 (diff) | |
| parent | 1c32099b52a8ea66380d71557e264a563f418b83 (diff) | |
Merge "Use boundsChangeTransaction to improve split-screen enter/exit" into rvc-dev am: 82352f9db8 am: eabcec5bf2 am: 1c32099b52
Original change: undetermined
Change-Id: I75e4580f7012dca7d5e84ed1f1b6d91c5ccb63e3
Diffstat (limited to 'core/java/android/view/WindowlessWindowManager.java')
| -rw-r--r-- | core/java/android/view/WindowlessWindowManager.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/view/WindowlessWindowManager.java b/core/java/android/view/WindowlessWindowManager.java index 9b5b8824b0e6..a5ec4e900641 100644 --- a/core/java/android/view/WindowlessWindowManager.java +++ b/core/java/android/view/WindowlessWindowManager.java @@ -209,7 +209,11 @@ public class WindowlessWindowManager implements IWindowSession { /** @hide */ protected SurfaceControl getSurfaceControl(View rootView) { - final State s = mStateForWindow.get(rootView.getViewRootImpl().mWindow.asBinder()); + final ViewRootImpl root = rootView.getViewRootImpl(); + if (root == null) { + return null; + } + final State s = mStateForWindow.get(root.mWindow.asBinder()); if (s == null) { return null; } |