commit 479f872dce148e8780e943362cc3271e193a07c6
author Albert Chaulk <achaulk@google.com> Fri Feb 03 17:00:39 2017 -0500
committer Alex Vakulenko <avakulenko@google.com> Fri Feb 03 16:04:16 2017 -0800
tree f4cca666e9a589fdf185307a49954edda8102cdb
parent a8ebffe4b9b237a691f7a8fe798d094f872166fd

Fixup 2D app patch, forgot to remove unused variable

Bug: None
Test: permissiongen to check non-2d app uage
Change-Id: I712083dfe417eb5549b78dc7ab1ee37faa042338

services/vr/vr_window_manager/shell_view.cpp

diff --git a/services/vr/vr_window_manager/shell_view.cpp b/services/vr/vr_window_manager/shell_view.cpp
index 109aecd..11680af 100644
--- a/services/vr/vr_window_manager/shell_view.cpp
+++ b/services/vr/vr_window_manager/shell_view.cpp
@@ -349,7 +349,7 @@
 
   surface_flinger_view_->GetTextures(*current_frame_.frame.get(), &textures_,
                                      &ime_texture_, debug_mode_,
-                                     view_mode_ == ViewMode::VR);
+                                     current_frame_.visibility == ViewMode::VR);
   has_ime_ = ime_texture_.texture != nullptr;
 }
 

services/vr/vr_window_manager/shell_view.h

diff --git a/services/vr/vr_window_manager/shell_view.h b/services/vr/vr_window_manager/shell_view.h
index a70b7ad..ba46e6d 100644
--- a/services/vr/vr_window_manager/shell_view.h
+++ b/services/vr/vr_window_manager/shell_view.h
@@ -72,7 +72,6 @@
   std::unique_ptr<ShaderProgram> overlay_program_;
   std::unique_ptr<ShaderProgram> controller_program_;
 
-  ViewMode view_mode_ = ViewMode::Hidden;
   // This starts at -1 so we don't call ReleaseFrame for the first frame.
   int skipped_frame_count_ = -1;