commit 0bcc104ad740d1ee1cbae8f803a332573282f099
author Alex Sakhartchouk <alexst@google.com> Thu Feb 02 17:27:42 2017 -0500
committer Alex Vakulenko <avakulenko@google.com> Fri Feb 03 15:58:20 2017 -0800
tree 52a27b76d7032ace502bed06e1c7477b0dfca427
parent ea572425ac5438d6d27eca83104b795100ca87af

Move surface_flinger_view creation into init code.

We use it to receive buffers and trigger visibility.

Bug: None
Test: triggered permission
Change-Id: I41ed91a16fb6bfb27687476fbe43c17fc05bc870

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 ca49db7..52925cf 100644
--- a/services/vr/vr_window_manager/shell_view.cpp
+++ b/services/vr/vr_window_manager/shell_view.cpp
@@ -245,6 +245,10 @@
   if (!InitializeTouch())
     ALOGE("Failed to initialize virtual touchpad");
 
+  surface_flinger_view_.reset(new SurfaceFlingerView);
+  if (!surface_flinger_view_->Initialize(this))
+    return 1;
+
   return 0;
 }
 
@@ -262,10 +266,6 @@
   if (!program_ || !overlay_program_ || !controller_program_)
     return 1;
 
-  surface_flinger_view_.reset(new SurfaceFlingerView);
-  if (!surface_flinger_view_->Initialize(this))
-    return 1;
-
   reticle_.reset(new Reticle());
   if (!reticle_->Initialize())
     return 1;