From 6cef92b4aeb1b46c09ed5a243dcfe8666e73b27c Mon Sep 17 00:00:00 2001
From: Santos Cordon <santoscordon@google.com>
Date: Thu, 9 Mar 2017 16:23:03 -0800
Subject: [PATCH] Add a missing null check.

Change-Id: I48d77d126e9afcaf652aa83ebecd8555e7d6c642
---
 .../core/java/com/android/server/vr/CompatibilityDisplay.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);
             }