Merge "Properly applies the selected saturation boost (vivid mode)" into oc-dr1-dev

diff --cc services/surfaceflinger/SurfaceFlinger.cpp
Simple merge

diff --cc services/surfaceflinger/SurfaceFlinger.h
index dfdc424,e00b3d1..48bbd13
--- 1/services/surfaceflinger/SurfaceFlinger.h
--- 2/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@@ -433,9 -434,14 +433,14 @@@ private
              bool isLocalScreenshot);
  #endif
  
 -    sp<StartBootAnimThread> mStartBootAnimThread = nullptr;
 +    sp<StartPropertySetThread> mStartPropertySetThread = nullptr;
  
      /* ------------------------------------------------------------------------
+      * Properties
+      */
+     void readPersistentProperties();
+ 
+     /* ------------------------------------------------------------------------
       * EGL
       */
      size_t getMaxTextureSize() const;