commit 2572bd4f89c575709349c9e6c31cd1c3a343d852
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Feb 07 15:16:35 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 07 15:16:36 2017 +0000
tree 59fbbbd1dacd941761956f43bd6000e71e1ed9fb
parent 44c186c9bace953dda54f0b606ed025eb7e5dca6
parent ffbf8e3d25dfd5e0fb87c19c88d8796daac2eb81

Merge "VR: Fail presentation without layers"

services/vr/vr_window_manager/composer/impl/vr_hwc.cpp

diff --git a/services/vr/vr_window_manager/composer/impl/vr_hwc.cpp b/services/vr/vr_window_manager/composer/impl/vr_hwc.cpp
index f83fa86..7e406a5 100644
--- a/services/vr/vr_window_manager/composer/impl/vr_hwc.cpp
+++ b/services/vr/vr_window_manager/composer/impl/vr_hwc.cpp
@@ -178,6 +178,11 @@
     }
   }
 
+  if (frame.empty()) {
+    ALOGE("Requested frame with no layers");
+    return Error::BAD_LAYER;
+  }
+
   // Increment the time the fence is signalled every time we get the
   // presentation frame. This ensures that calling ReleaseFrame() only affects
   // the current frame.