Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1a7e794 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "vrwm: Fix flickering when entering/leaving VR"

parents fbffe92a d1add22b

services/vr/vr_window_manager/hwc_callback.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,8 @@ class HwcCallback : public VrComposerView::Callback { 
  struct HwcLayer {

  struct HwcLayer {

    enum LayerType : uint32_t {

    enum LayerType : uint32_t {

      // These are from frameworks/base/core/java/android/view/WindowManager.java

      // These are from frameworks/base/core/java/android/view/WindowManager.java

      kUndefinedWindow = 0,

      kSurfaceFlingerLayer = 0,

      kUndefinedWindow = ~0U,

      kFirstApplicationWindow = 1,

      kFirstApplicationWindow = 1,

      kLastApplicationWindow = 99,

      kLastApplicationWindow = 99,

      kFirstSubWindow = 1000,

      kFirstSubWindow = 1000,
@@ -42,6 +43,7 @@ class HwcCallback : public VrComposerView::Callback { 
        // Always skip the following layer types

        // Always skip the following layer types

      case kNavigationBar:

      case kNavigationBar:

      case kStatusBar:

      case kStatusBar:

      case kSurfaceFlingerLayer:

      case kUndefinedWindow:

      case kUndefinedWindow:

        return true;

        return true;

      default:

      default: