Merge "vrwm: Fix flickering when entering/leaving VR"
diff --git a/services/vr/vr_window_manager/hwc_callback.h b/services/vr/vr_window_manager/hwc_callback.h
index bcfeb97..f34aaf9 100644
--- a/services/vr/vr_window_manager/hwc_callback.h
+++ b/services/vr/vr_window_manager/hwc_callback.h
@@ -25,7 +25,8 @@
struct HwcLayer {
enum LayerType : uint32_t {
// These are from frameworks/base/core/java/android/view/WindowManager.java
- kUndefinedWindow = 0,
+ kSurfaceFlingerLayer = 0,
+ kUndefinedWindow = ~0U,
kFirstApplicationWindow = 1,
kLastApplicationWindow = 99,
kFirstSubWindow = 1000,
@@ -42,6 +43,7 @@
// Always skip the following layer types
case kNavigationBar:
case kStatusBar:
+ case kSurfaceFlingerLayer:
case kUndefinedWindow:
return true;
default: