summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-06-06 07:21:02 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-06-06 07:21:02 +0000
commit29401dab51760176e2bc699d8e2cc1b655f6d5b5 (patch)
treee33397432203a48df0207bc7f49dc3cae6372a0f
parentc604823568f76e2f44f1fbdef29380b4e5628190 (diff)
parent95dab68d55f7cfe1b852e324f09cf7df118c1d64 (diff)
downloaddevice_generic_goldfish-29401dab51760176e2bc699d8e2cc1b655f6d5b5.tar.gz
device_generic_goldfish-29401dab51760176e2bc699d8e2cc1b655f6d5b5.tar.bz2
device_generic_goldfish-29401dab51760176e2bc699d8e2cc1b655f6d5b5.zip
Snap for 4824048 from 95dab68d55f7cfe1b852e324f09cf7df118c1d64 to pi-release
Change-Id: I187d4049adf690bbf69e8edce4ddbd71ca7e32dd
-rw-r--r--hwcomposer/hwcomposer.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/hwcomposer/hwcomposer.cpp b/hwcomposer/hwcomposer.cpp
index bcd7c302..702527fd 100644
--- a/hwcomposer/hwcomposer.cpp
+++ b/hwcomposer/hwcomposer.cpp
@@ -208,6 +208,9 @@ static int hwc_get_display_attributes(struct hwc_composer_device_1* dev __unused
for (int i = 0; attributes[i] != HWC_DISPLAY_NO_ATTRIBUTE; i++) {
if (disp == HWC_DISPLAY_PRIMARY) {
values[i] = hwc_attribute(pdev, attributes[i]);
+ if (values[i] == -EINVAL) {
+ return -EINVAL;
+ }
} else {
ALOGE("unknown display type %u", disp);
return -EINVAL;