Revert "sm7250-common: Enable color mode & set display calibration on color mode settings"

This reverts commit 84e9206b3a.

overlay/frameworks/base/core/res/res/values/config.xml

@@ -308,40 +308,7 @@
         <item>0:2:15</item> <!-- ID0:Fingerprint:Strong -->
     </string-array>
 
-    <!-- List supported color modes. -->
+    <!-- How long it takes for the HW to start illuminating after the illumination is requested. -->
-    <integer-array name="config_availableColorModes">
-        <item>0</item> <!-- COLOR_MODE_NATURAL -->
-        <item>1</item> <!-- COLOR_MODE_BOOSTED -->
-        <item>2</item> <!-- COLOR_MODE_SATURATED -->
-        <item>3</item> <!-- COLOR_MODE_AUTOMATIC -->
-    </integer-array>
-
-    <!-- The following two arrays specify which color space to use for display composition when a
-         certain color mode is active.
-         Composition color spaces are defined in android.view.Display.COLOR_MODE_xxx, and color
-         modes are defined in ColorDisplayManager.COLOR_MODE_xxx and
-         ColorDisplayManager.VENDOR_COLOR_MODE_xxx.
-         The color space COLOR_MODE_DEFAULT (0) lets the system select the most appropriate
-         composition color space for currently displayed content. Other values (e.g.,
-         COLOR_MODE_SRGB) override system selection; these other color spaces must be supported by
-         the device for for display composition.
-         If a color mode does not have a corresponding color space specified in this array, the
-         currently set composition color space will not be modified.-->
-    <integer-array name="config_displayCompositionColorModes">
-        <item>0</item> <!-- COLOR_MODE_NATURAL   -->
-        <item>1</item> <!-- COLOR_MODE_BOOSTED   -->
-        <item>2</item> <!-- COLOR_MODE_SATURATED -->
-        <item>3</item> <!-- COLOR_MODE_AUTOMATIC -->
-    </integer-array>
-
-    <integer-array name="config_displayCompositionColorSpaces">
-        <item>0</item> <!-- COLOR_MODE_DEFAULT    -->
-        <item>0</item> <!-- COLOR_MODE_DEFAULT    -->
-        <item>0</item> <!-- COLOR_MODE_DEFAULT    -->
-        <item>9</item> <!-- COLOR_MODE_DISPLAY_P3 -->
-    </integer-array>
-
-     <!-- How long it takes for the HW to start illuminating after the illumination is requested. -->
     <integer name="config_udfps_illumination_transition_ms">0</integer>
 
     <!-- The default refresh rate for a given device. Change this value to set a higher default

rootdir/Android.mk

@@ -104,14 +104,6 @@ LOCAL_SRC_FILES    := etc/init.oem.rc
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)/init/hw
 include $(BUILD_PREBUILT)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE       := init.color.rc
-LOCAL_MODULE_TAGS  := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := etc/init.color.rc
-LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)/init/hw
-include $(BUILD_PREBUILT)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE       := init.qcom.factory.rc
 LOCAL_MODULE_TAGS  := optional

rootdir/etc/init.color.rc

@@ -1,18 +0,0 @@
-on boot
-    chown system system  /sys/class/drm/card0-DSI-1/native_display_p3_mode
-    chown system system  /sys/class/drm/card0-DSI-1/native_display_srgb_color_mode
-
-# Set sRGB calibration on Natural and Boosted Mode.
-on property:persist.sys.sf.native_mode=0
-    write /sys/class/drm/card0-DSI-1/native_display_p3_mode 0
-    write /sys/class/drm/card0-DSI-1/native_display_srgb_color_mode 1
-
-# Set unmanaged calibration on Saturated Mode.
-on property:persist.sys.sf.native_mode=1
-    write /sys/class/drm/card0-DSI-1/native_display_srgb_color_mode 0
-    write /sys/class/drm/card0-DSI-1/native_display_p3_mode 0
-
-# Set P3 calibration on Adaptive/Automatic Mode.
-on property:persist.sys.sf.native_mode=2
-    write /sys/class/drm/card0-DSI-1/native_display_srgb_color_mode 0
-    write /sys/class/drm/card0-DSI-1/native_display_p3_mode 1

sepolicy/vendor/file.te

@@ -20,4 +20,3 @@ type sysfs_tpd, fs_type, sysfs_type;
 type sysfs_tri_state_key, sysfs_type, fs_type;
 type sysfs_vl53l1, fs_type, sysfs_type;
 type vendor_sysfs_video_call_on, fs_type, sysfs_type;
-type sysfs_color, fs_type, sysfs_type;

sepolicy/vendor/genfs_contexts

@@ -17,8 +17,6 @@ genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1
 genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/hbm                                   u:object_r:sysfs_livedisplay_tuneable:s0
 genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/notify_dim                            u:object_r:sysfs_fod:s0
 genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/notify_fppress                        u:object_r:sysfs_fod:s0
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/native_display_p3_mode                u:object_r:sysfs_color:s0
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/native_display_srgb_color_mode        u:object_r:sysfs_color:s0
 genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/power_status                          u:object_r:sysfs_fod:s0
 genfscon sysfs /devices/platform/soc/soc:tri_state_key/hall_data_calib                                                 u:object_r:sysfs_tri_state_key:s0
 genfscon sysfs /module/memplus_core/parameters                                                                         u:object_r:sysfs_memplus:s0

sepolicy/vendor/hal_display_default.te

@@ -12,8 +12,6 @@ binder_call(hal_display_default, vendor_hal_display_color)
 
 allow hal_display_default vendor_hal_display_postproc_hwservice:hwservice_manager find;
 
-allow hal_display_default sysfs_color:file rw_file_perms;
-
 allow hal_display_default sysfs:file rw_file_perms;
 allow hal_display_default sysfs_fod:file rw_file_perms;