From: Albert Chaulk <achaulk@google.com>
Date: Fri, 3 Feb 2017 22:00:39 +0000 (-0500)
Subject: Fixup 2D app patch, forgot to remove unused variable
X-Git-Tag: android-x86-8.1-r1~391^2~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=479f872dce148e8780e943362cc3271e193a07c6;p=android-x86%2Fframeworks-native.git

Fixup 2D app patch, forgot to remove unused variable

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

diff --git a/services/vr/vr_window_manager/shell_view.cpp b/services/vr/vr_window_manager/shell_view.cpp
index 109aecdaea..11680af56c 100644
--- a/services/vr/vr_window_manager/shell_view.cpp
+++ b/services/vr/vr_window_manager/shell_view.cpp
@@ -349,7 +349,7 @@ void ShellView::OnDrawFrame() {
 
   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;
 }
 
diff --git a/services/vr/vr_window_manager/shell_view.h b/services/vr/vr_window_manager/shell_view.h
index a70b7adeb5..ba46e6ddf6 100644
--- a/services/vr/vr_window_manager/shell_view.h
+++ b/services/vr/vr_window_manager/shell_view.h
@@ -72,7 +72,6 @@ class ShellView : public Application, public HwcCallback::Client {
   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;