Merge "Add a missing null check."

2017-03-10 02:26:00 +00:00
parent b20f320954 6cef92b4ae
commit ae4e24c234
1 changed files with 1 additions and 1 deletions
--- 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);
            }