commit 13f964b7b88c1fdbbea6c405ac3b415425d03085
author Linux Build Service Account <lnxbuild@localhost> Wed Jun 29 11:34:46 2016 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jun 29 11:34:46 2016 -0700
tree ee771b1f9b2558cf0951339be7970d8059175910
parent ad4954404acca67915ee9d607df985fcab16f705
parent 5823ae57e37f8407daeb31f7d3c58cb7cf2a8abb

Merge "sdm: Always apply color mode"

sdm/libs/core/display_base.cpp

diff --git a/sdm/libs/core/display_base.cpp b/sdm/libs/core/display_base.cpp
index 84a137c..e143639 100644
--- a/sdm/libs/core/display_base.cpp
+++ b/sdm/libs/core/display_base.cpp
@@ -780,10 +780,6 @@
   }
 
   SDEDisplayMode *sde_display_mode = it->second;
-  if (color_mode_ == sde_display_mode->id) {
-    DLOGV_IF(kTagQDCM, "Same mode requested");
-    return kErrorNone;
-  }
 
   DLOGV_IF(kTagQDCM, "Color Mode Name = %s corresponding mode_id = %d", sde_display_mode->name,
            sde_display_mode->id);
@@ -794,8 +790,6 @@
     return error;
   }
 
-  color_mode_ = sde_display_mode->id;
-
   return error;
 }
 

sdm/libs/core/display_base.h

diff --git a/sdm/libs/core/display_base.h b/sdm/libs/core/display_base.h
index a9f1c3d..b802ea6 100644
--- a/sdm/libs/core/display_base.h
+++ b/sdm/libs/core/display_base.h
@@ -147,7 +147,6 @@
   bool disable_pu_one_frame_ = false;
   uint32_t num_color_modes_ = 0;
   SDEDisplayMode *color_modes_ = NULL;
-  int32_t color_mode_ = 0;
   typedef std::map<std::string, SDEDisplayMode *> ColorModeMap;
   ColorModeMap color_mode_map_ = {};
   HWDisplayAttributes display_attributes_ = {};