Merge "sdm: Check for pending doze transition on first cycle."
diff --git a/config/trinket.mk b/config/trinket.mk
index d3d7857..cfcba97 100644
--- a/config/trinket.mk
+++ b/config/trinket.mk
@@ -18,9 +18,11 @@
libqdMetaData.system \
modetest
-#QDCM calibration xml file
+#QDCM calibration xml file base on td4330
PRODUCT_COPY_FILES += hardware/qcom/display/config/qdcm_calib_data_trinket_default.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_td4330_cmd_mode_dsi_truly_panel.xml
PRODUCT_COPY_FILES += hardware/qcom/display/config/qdcm_calib_data_trinket_default.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_td4330_video_mode_dsi_truly_panel.xml
+#QDCM calibration xml file base on nt36672
+PRODUCT_COPY_FILES += hardware/qcom/display/config/qdcm_calib_data_trinket_default.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_nt36672_truly_fhd_video_mode_dsi_panel.xml
#Enable Charging Icon
TARGET_RECOVERY_PIXEL_FORMAT := RGBX_8888
diff --git a/sdm/libs/hwc2/hwc_display_virtual.cpp b/sdm/libs/hwc2/hwc_display_virtual.cpp
index acad061..d58ef2f 100644
--- a/sdm/libs/hwc2/hwc_display_virtual.cpp
+++ b/sdm/libs/hwc2/hwc_display_virtual.cpp
@@ -311,4 +311,8 @@
return HWC2::Error::None;
}
+HWC2::Error HWCDisplayVirtual::SetColorMode(ColorMode mode) {
+ return HWC2::Error::None;
+}
+
} // namespace sdm
diff --git a/sdm/libs/hwc2/hwc_display_virtual.h b/sdm/libs/hwc2/hwc_display_virtual.h
index 58d5b20..6b39775 100644
--- a/sdm/libs/hwc2/hwc_display_virtual.h
+++ b/sdm/libs/hwc2/hwc_display_virtual.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2019, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -50,6 +50,7 @@
virtual HWC2::Error SetFrameDumpConfig(uint32_t count, uint32_t bit_mask_layer_type,
int32_t format, bool post_processed);
virtual HWC2::Error GetDisplayType(int32_t *out_type);
+ virtual HWC2::Error SetColorMode(ColorMode mode);
HWC2::Error SetOutputBuffer(buffer_handle_t buf, int32_t release_fence);
private: