summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin F. Haggerty <haggertk@lineageos.org>2019-08-12 22:22:11 -0600
committerKevin F. Haggerty <haggertk@lineageos.org>2019-08-12 22:22:11 -0600
commit60362564f41b89e21647ff36bb0364d36c6a8be4 (patch)
tree2ab096f9c630529216031869e05c64767ba60127
parent27b78f208a55870c89084991fbc852d7de827253 (diff)
parentf63f537eb260fe4397155d95d8c9af2f8ee3e38a (diff)
downloadhardware_qcom_display-lineage-15.1.tar.gz
hardware_qcom_display-lineage-15.1.tar.bz2
hardware_qcom_display-lineage-15.1.zip
Merge remote-tracking branch 'aosp/oreo-mr1-security-release' into lineage-15.1lineage-15.1
* aosp/oreo-mr1-security-release: sdm: hwc2: validate display id in SetColorModeById Change-Id: I26107109ce5984ba41098189e40dece977b90bf1
-rw-r--r--msm8998/sdm/libs/hwc2/hwc_session.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/msm8998/sdm/libs/hwc2/hwc_session.cpp b/msm8998/sdm/libs/hwc2/hwc_session.cpp
index d58ce0f98..302980519 100644
--- a/msm8998/sdm/libs/hwc2/hwc_session.cpp
+++ b/msm8998/sdm/libs/hwc2/hwc_session.cpp
@@ -1267,7 +1267,7 @@ android::status_t HWCSession::SetColorModeById(const android::Parcel *input_parc
auto device = static_cast<hwc2_device_t *>(this);
if (display > HWC_DISPLAY_VIRTUAL) {
- return -EINVAL;
+ return android::BAD_VALUE;
}
auto err = CallDisplayFunction(device, display, &HWCDisplay::SetColorModeById, mode);