summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-06-06 00:42:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-06-06 00:42:20 +0000
commit95dab68d55f7cfe1b852e324f09cf7df118c1d64 (patch)
treee33397432203a48df0207bc7f49dc3cae6372a0f
parent58ea3df6b8a524a335974ecea65b288338c94f42 (diff)
parentce5d6f73e866dafc0f2798c48c0043bf975e6431 (diff)
downloaddevice_generic_goldfish-95dab68d55f7cfe1b852e324f09cf7df118c1d64.tar.gz
device_generic_goldfish-95dab68d55f7cfe1b852e324f09cf7df118c1d64.tar.bz2
device_generic_goldfish-95dab68d55f7cfe1b852e324f09cf7df118c1d64.zip
Merge "goldfish hwcomposer should return error if attribute is not provided" into pi-dev
-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;