diff options
author | Robin Peng <robinpeng@google.com> | 2019-04-01 07:19:24 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-01 07:19:24 +0000 |
commit | ae6c99073bb9241fb428688ef8b70b5592e9e604 (patch) | |
tree | b7fcaedb4a1f1c0a9c495d910e43eca7d8edd8ec | |
parent | 1f9c6d40d3e6407d058bfbda0a993343ea26fe50 (diff) | |
parent | 2473e406b889a9cf0c606f9d3a9db2ce0274acd9 (diff) | |
download | android_hardware_qcom_sdm845_display-ae6c99073bb9241fb428688ef8b70b5592e9e604.tar.gz android_hardware_qcom_sdm845_display-ae6c99073bb9241fb428688ef8b70b5592e9e604.tar.bz2 android_hardware_qcom_sdm845_display-ae6c99073bb9241fb428688ef8b70b5592e9e604.zip |
Merge "Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C1.08.00.00.516.101'"
-rw-r--r-- | config/sdm710.mk | 1 | ||||
-rw-r--r-- | sdm/libs/hwc2/hwc_session_services.cpp | 17 |
2 files changed, 12 insertions, 6 deletions
diff --git a/config/sdm710.mk b/config/sdm710.mk index 4e5c11b3..83ba1437 100644 --- a/config/sdm710.mk +++ b/config/sdm710.mk @@ -44,6 +44,7 @@ endif PRODUCT_PROPERTY_OVERRIDES += \ persist.demo.hdmirotationlock=false \ + persist.sys.sf.color_saturation=1.0 \ ro.vendor.display.cabl=2 \ debug.sf.latch_unsignaled=1 \ vendor.display.enable_default_color_mode=1 \ diff --git a/sdm/libs/hwc2/hwc_session_services.cpp b/sdm/libs/hwc2/hwc_session_services.cpp index 90ed00b4..7600fc85 100644 --- a/sdm/libs/hwc2/hwc_session_services.cpp +++ b/sdm/libs/hwc2/hwc_session_services.cpp @@ -1,5 +1,5 @@ /* -* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved. +* Copyright (c) 2017-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 @@ -158,7 +158,8 @@ Return<int32_t> HWCSession::configureDynRefeshRate(IDisplayConfig::DisplayDynRef } int32_t HWCSession::GetConfigCount(int disp_id, uint32_t *count) { - if (disp_id < 0) { + if (disp_id < HWC_DISPLAY_PRIMARY || disp_id >= HWC_NUM_DISPLAY_TYPES) { + DLOGE("Invalid display = %d", disp_id); return -EINVAL; } @@ -182,7 +183,8 @@ Return<void> HWCSession::getConfigCount(IDisplayConfig::DisplayType dpy, } int32_t HWCSession::GetActiveConfigIndex(int disp_id, uint32_t *config) { - if (disp_id < 0) { + if (disp_id < HWC_DISPLAY_PRIMARY || disp_id >= HWC_NUM_DISPLAY_TYPES) { + DLOGE("Invalid display = %d", disp_id); return -EINVAL; } @@ -206,7 +208,8 @@ Return<void> HWCSession::getActiveConfig(IDisplayConfig::DisplayType dpy, } int32_t HWCSession::SetActiveConfigIndex(int disp_id, uint32_t config) { - if (disp_id < 0) { + if (disp_id < HWC_DISPLAY_PRIMARY || disp_id >= HWC_NUM_DISPLAY_TYPES) { + DLOGE("Invalid display = %d", disp_id); return -EINVAL; } @@ -295,7 +298,8 @@ Return<void> HWCSession::getPanelBrightness(getPanelBrightness_cb _hidl_cb) { int32_t HWCSession::MinHdcpEncryptionLevelChanged(int disp_id, uint32_t min_enc_level) { DLOGI("Display %d", disp_id); - if (disp_id < 0) { + if (disp_id < HWC_DISPLAY_PRIMARY || disp_id >= HWC_NUM_DISPLAY_TYPES) { + DLOGE("Invalid display = %d", disp_id); return -EINVAL; } @@ -324,7 +328,8 @@ Return<int32_t> HWCSession::refreshScreen() { } int32_t HWCSession::ControlPartialUpdate(int disp_id, bool enable) { - if (disp_id < 0) { + if (disp_id < HWC_DISPLAY_PRIMARY || disp_id >= HWC_NUM_DISPLAY_TYPES) { + DLOGE("Invalid display = %d", disp_id); return -EINVAL; } |