diff options
| author | Andriy Naborskyy <andriyn@google.com> | 2016-07-08 17:56:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-08 17:56:39 +0000 |
| commit | 59b023a4d99f1794155346ddb00d80e05ee55c0f (patch) | |
| tree | f838cfeacf6127193d9589844f651f69fc7f1a30 | |
| parent | 609fefa70504b720cc0f501d618a72d551103a1f (diff) | |
| parent | 56b8c3132cdb4b13043dc50b2be52f3f3214b96b (diff) | |
| download | hwcomposer-59b023a4d99f1794155346ddb00d80e05ee55c0f.tar.gz | |
Merge \\"gfx: support external display\\" into cw-e-dev am: e3e49cc873
am: 56b8c3132c
Change-Id: Ide2571a4a3d9c533f6185cebbd18addece5495a9
| -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) { |