summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Tasayco Loarte <victorx.tasayco.loarte@intel.com>2016-07-08 17:52:46 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-08 17:52:46 +0000
commit56b8c3132cdb4b13043dc50b2be52f3f3214b96b (patch)
tree256483a3883267a41d21a5d43bf0440c7fd2cf9c
parentb07371a4c981d1b729735ceb11e13aab849d73b5 (diff)
parente3e49cc8739b8f8dbebdea2e38c7890d11b623ee (diff)
downloadhwcomposer-56b8c3132cdb4b13043dc50b2be52f3f3214b96b.tar.gz
Merge \"gfx: support external display\" into cw-e-dev
am: e3e49cc873 Change-Id: I52091a5f38e615b568ba81735c364b6a8c5277c7
-rw-r--r--merrifield/common/base/Hwcomposer.cpp13
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) {