commit e21c9f35f038b9260e1fcc6d0050d8b3b21304ae
author android-build-prod (mdb) <android-build-team-robot@google.com> Thu Sep 13 21:21:11 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 13 21:21:11 2018 +0000
tree ef0a595536a6980a30e2ccb560c2b755162ba01c
parent 4fb1ecd92358d7ad34cd2f1a60058b04e257e4f0
parent 5c16172ee8ff140665fa4fa9c1d4b45b7c3a7e61

Merge "Snap for 5009372 from 476f2e90db3279c39eb751f71b615a18a662dc62 to pie-cts-release" into pie-cts-release

msm8996/sdm/libs/hwc2/hwc_session.cpp

diff --git a/msm8996/sdm/libs/hwc2/hwc_session.cpp b/msm8996/sdm/libs/hwc2/hwc_session.cpp
index d12d758..a0ff525 100644
--- a/msm8996/sdm/libs/hwc2/hwc_session.cpp
+++ b/msm8996/sdm/libs/hwc2/hwc_session.cpp
@@ -1221,6 +1221,11 @@
   auto display = static_cast<hwc2_display_t >(input_parcel->readInt32());
   auto mode = static_cast<android_color_mode_t>(input_parcel->readInt32());
   auto device = static_cast<hwc2_device_t *>(this);
+
+  if (display > HWC_DISPLAY_VIRTUAL) {
+    return -EINVAL;
+  }
+
   auto err = CallDisplayFunction(device, display, &HWCDisplay::SetColorMode, mode);
   if (err != HWC2_ERROR_NONE)
     return -EINVAL;

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..d58ce0f 100644
--- a/msm8998/sdm/libs/hwc2/hwc_session.cpp
+++ b/msm8998/sdm/libs/hwc2/hwc_session.cpp
@@ -1250,6 +1250,11 @@
   auto display = static_cast<hwc2_display_t >(input_parcel->readInt32());
   auto mode = static_cast<android_color_mode_t>(input_parcel->readInt32());
   auto device = static_cast<hwc2_device_t *>(this);
+
+  if (display > HWC_DISPLAY_VIRTUAL) {
+    return -EINVAL;
+  }
+
   auto err = CallDisplayFunction(device, display, &HWCDisplay::SetColorMode, mode);
   if (err != HWC2_ERROR_NONE)
     return -EINVAL;