From: Pat Plunkett <patplunkett@google.com>
Date: Wed, 12 Jul 2017 21:09:27 +0000 (-0700)
Subject: Set the layer composition type in HWC
X-Git-Tag: android-x86-8.1-r1~33^2~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9db7166d7cf1ef4b9b1a0a997fada57318851e74;p=android-x86%2Fframeworks-native.git

Set the layer composition type in HWC

Setting up the VR hardware composer was causing a call to
setLayerCompositionType with an invalid composition type. This removes the
call, since setting the layer composition type is already handled in
Layer::Prepare().

Bug: 63633934
Test: Start VR mode, check that the logcat errors are no longer present.
Change-Id: I94f9a253bce9c5c25be7927d0003adbb9409ab36
---

diff --git a/libs/vr/libvrflinger/hardware_composer.cpp b/libs/vr/libvrflinger/hardware_composer.cpp
index d595896296..c19fb249dd 100644
--- a/libs/vr/libvrflinger/hardware_composer.cpp
+++ b/libs/vr/libvrflinger/hardware_composer.cpp
@@ -1060,14 +1060,6 @@ void Layer::UpdateLayerSettings() {
 
   UpdateVisibilitySettings();
 
-  error = composer_->setLayerCompositionType(
-      display, hardware_composer_layer_,
-      composition_type_.cast<Hwc2::IComposerClient::Composition>());
-  ALOGE_IF(
-      error != HWC::Error::None,
-      "Layer::UpdateLayerSettings: Error setting layer composition type: %s",
-      error.to_string().c_str());
-
   // TODO(eieio): Use surface attributes or some other mechanism to control
   // the layer display frame.
   error = composer_->setLayerDisplayFrame(