diff options
author | Andriy Naborskyy <andriyn@google.com> | 2016-07-08 18:04:25 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-08 18:04:25 +0000 |
commit | b59cc055c86e0ed36a2cc6616ccb5be72e24447d (patch) | |
tree | f838cfeacf6127193d9589844f651f69fc7f1a30 | |
parent | 3f0aa3c9a7eadbc464b66ab480ade8f507c5b1ee (diff) | |
parent | 920769ebb9d4494458c218cfcaa614796d4c74b1 (diff) | |
download | hwcomposer-b59cc055c86e0ed36a2cc6616ccb5be72e24447d.tar.gz |
Merge \\\\"gfx: support external display\\\\" into cw-e-dev am: e3e49cc873 am: 56b8c3132c am: 59b023a4d9
am: 920769ebb9
Change-Id: I34f7f3de542286aa10a2b1e8f83443fbeddf64c9
-rw-r--r-- | merrifield/common/base/Hwcomposer.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/merrifield/common/base/Hwcomposer.cpp b/merrifield/common/base/Hwcomposer.cpp index 6f1698a..e4d9ad8 100644 --- a/merrifield/common/base/Hwcomposer.cpp +++ b/merrifield/common/base/Hwcomposer.cpp @@ -81,8 +81,9 @@ bool Hwcomposer::prepare(size_t numDisplays, VTRACE("device %d doesn't exist", i); continue; } - if (device->getType() != IDisplayDevice::DEVICE_PRIMARY) - continue; + + if (device->getType() == IDisplayDevice::DEVICE_VIRTUAL) + continue; device->prePrepare(displays[i]); } @@ -94,8 +95,8 @@ bool Hwcomposer::prepare(size_t numDisplays, continue; } - if (device->getType() != IDisplayDevice::DEVICE_PRIMARY) - continue; + if (device->getType() == IDisplayDevice::DEVICE_VIRTUAL) + continue; ret = device->prepare(displays[i]); if (ret == false) { @@ -137,8 +138,8 @@ bool Hwcomposer::commit(size_t numDisplays, continue; } - if (device->getType() != IDisplayDevice::DEVICE_PRIMARY) - continue; + if (device->getType() == IDisplayDevice::DEVICE_VIRTUAL) + continue; ret = device->commit(displays[i], mDisplayContext); if (ret == false) { |