diff --git a/services/core/java/com/android/server/vr/CompatibilityDisplay.java b/services/core/java/com/android/server/vr/CompatibilityDisplay.java index c54fd9a650c7e..5e17daa0f153b 100644 --- a/services/core/java/com/android/server/vr/CompatibilityDisplay.java +++ b/services/core/java/com/android/server/vr/CompatibilityDisplay.java @@ -156,7 +156,7 @@ class CompatibilityDisplay { mVirtualDisplay = mDisplayManager.createVirtualDisplay("VR 2D Display", WIDTH, HEIGHT, DPI, null /* Surface */, 0 /* flags */); - if (mSurface != null && mSurface.isValid()) { + if (mVirtualDisplay != null && mSurface != null && mSurface.isValid()) { // TODO: Need to protect all setSurface calls with a lock. mVirtualDisplay.setSurface(mSurface); }