commit f63f537eb260fe4397155d95d8c9af2f8ee3e38a
author Chia-I Wu <olv@google.com> Wed Jul 19 14:00:36 2017 -0700
committer Rohit Yengisetty <rngy@google.com> Tue Apr 17 18:52:43 2018 -0700
tree 836d28ea52526f855b928e7c02279954246a3a72
parent 058a6f9bf2a2c85974e5f8001dc5d8d68969390d

sdm: hwc2: validate display id in SetColorModeById

Bug: 63144992
Test: manual vndservice call
Change-Id: I239670334560b9db4ef781aac2612a86ea4363a9
(cherry picked from commit cba1cee4750a80db4b476c3273b06a6d575859f6)

msm8998/sdm/libs/hwc2/hwc_session.cpp

diff --git a/msm8998/sdm/libs/hwc2/hwc_session.cpp b/msm8998/sdm/libs/hwc2/hwc_session.cpp
index a9c7e4e..f99a00d 100644
--- a/msm8998/sdm/libs/hwc2/hwc_session.cpp
+++ b/msm8998/sdm/libs/hwc2/hwc_session.cpp
@@ -1262,7 +1262,7 @@
   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);