Merge "sdm: remove pending state for POMS transition in Doze"
diff --git a/config/display-product.mk b/config/display-product.mk
index 3c3c59b..b9467fe 100644
--- a/config/display-product.mk
+++ b/config/display-product.mk
@@ -7,8 +7,6 @@
vendor.qti.hardware.display.allocator-service \
android.hardware.memtrack@1.0-impl \
android.hardware.memtrack@1.0-service \
- android.hardware.light@2.0-impl \
- android.hardware.light@2.0-service \
gralloc.$(TARGET_BOARD_PLATFORM) \
lights.$(TARGET_BOARD_PLATFORM) \
hwcomposer.$(TARGET_BOARD_PLATFORM) \
diff --git a/gralloc/gr_buf_mgr.cpp b/gralloc/gr_buf_mgr.cpp
index cb8c0b4..f0b4639 100644
--- a/gralloc/gr_buf_mgr.cpp
+++ b/gralloc/gr_buf_mgr.cpp
@@ -988,11 +988,6 @@
hnd->base_metadata = 0;
hnd->layer_count = layer_count;
- // set default csc as 709, but for video(yuv) its 601L
-
- ColorSpace_t colorSpace = (buffer_type == BUFFER_TYPE_VIDEO) ? ITU_R_601 : ITU_R_709;
- setMetaDataAndUnmap(hnd, UPDATE_COLOR_SPACE, reinterpret_cast<void *>(&colorSpace));
-
bool use_adreno_for_size = CanUseAdrenoForSize(buffer_type, usage);
if (use_adreno_for_size) {
setMetaDataAndUnmap(hnd, SET_GRAPHICS_METADATA, reinterpret_cast<void *>(&graphics_metadata));