Merge changes from topic 'vr_wm'

* changes:
  VR: Add ability to pass layer info through SurfaceFlinger
  VR: Create VR implementation for HWC HIDL interface

1 files changed, 3 insertions, 0 deletions

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 3480d83d28..4798ecdedd 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2580,6 +2580,9 @@ uint32_t SurfaceFlinger::setClientStateLocked(
             // We don't trigger a traversal here because if no other state is
             // changed, we don't want this to cause any more work
         }
+        if (what & layer_state_t::eLayerInfoChanged) {
+          layer->setInfo(s.type, s.appid);
+        }
     }
     return flags;
 }