commit b593d86604ad5f5b7f3793d3ad968578f665d8ee
author android-build-team Robot <android-build-team-robot@google.com> Sat Jul 20 23:04:48 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Jul 20 23:04:48 2019 +0000
tree 14979e00bb9cf8078fc7146ac0e23fd15d9b3ffd
parent b6922a89f00f7899e15047dba6fa138bfa7ebeff
parent 04dfb2c33c8cc128b49249d06b31b20f48ca84d9

Snap for 5743138 from 04dfb2c33c8cc128b49249d06b31b20f48ca84d9 to qt-qpr1-release

Change-Id: I71a14c0a3bc6df7967c75135ff4175120e409bef

sdm/libs/core/comp_manager.cpp

diff --git a/sdm/libs/core/comp_manager.cpp b/sdm/libs/core/comp_manager.cpp
index 4780370..3628bce 100644
--- a/sdm/libs/core/comp_manager.cpp
+++ b/sdm/libs/core/comp_manager.cpp
@@ -327,8 +327,6 @@
     return error;
   }
 
-  error = resource_intf_->Stop(display_resource_ctx, hw_layers);
-
   return error;
 }
 
@@ -402,11 +400,14 @@
 
   display_comp_ctx->idle_fallback = false;
 
+  Handle &display_resource_ctx = display_comp_ctx->display_resource_ctx;
+  error = resource_intf_->Stop(display_resource_ctx, hw_layers);
+
   DLOGV_IF(kTagCompManager, "Registered displays [%s], configured displays [%s], display %d-%d",
            StringDisplayList(registered_displays_), StringDisplayList(configured_displays_),
            display_comp_ctx->display_id, display_comp_ctx->display_type);
 
-  return kErrorNone;
+  return error;
 }
 
 void CompManager::Purge(Handle display_ctx) {