diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2018-09-13 21:21:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-09-13 21:21:11 +0000 |
| commit | e21c9f35f038b9260e1fcc6d0050d8b3b21304ae (patch) | |
| tree | ef0a595536a6980a30e2ccb560c2b755162ba01c | |
| parent | 4fb1ecd92358d7ad34cd2f1a60058b04e257e4f0 (diff) | |
| parent | 5c16172ee8ff140665fa4fa9c1d4b45b7c3a7e61 (diff) | |
| download | display-e21c9f35f038b9260e1fcc6d0050d8b3b21304ae.tar.gz | |
Merge "Snap for 5009372 from 476f2e90db3279c39eb751f71b615a18a662dc62 to pie-cts-release" into pie-cts-releaseandroid-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10pie-cts-release
| -rw-r--r-- | msm8996/sdm/libs/hwc2/hwc_session.cpp | 5 | ||||
| -rw-r--r-- | msm8998/sdm/libs/hwc2/hwc_session.cpp | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/msm8996/sdm/libs/hwc2/hwc_session.cpp b/msm8996/sdm/libs/hwc2/hwc_session.cpp index d12d758f..a0ff5254 100644 --- a/msm8996/sdm/libs/hwc2/hwc_session.cpp +++ b/msm8996/sdm/libs/hwc2/hwc_session.cpp @@ -1221,6 +1221,11 @@ android::status_t HWCSession::SetColorModeOverride(const android::Parcel *input_ 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; diff --git a/msm8998/sdm/libs/hwc2/hwc_session.cpp b/msm8998/sdm/libs/hwc2/hwc_session.cpp index a9c7e4e2..d58ce0f9 100644 --- a/msm8998/sdm/libs/hwc2/hwc_session.cpp +++ b/msm8998/sdm/libs/hwc2/hwc_session.cpp @@ -1250,6 +1250,11 @@ android::status_t HWCSession::SetColorModeOverride(const android::Parcel *input_ 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; |