ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Check that HWC exists before trying to use it" into jb-mr1-dev

Browse Source
This commit is contained in:
Jesse Hall 2012-09-18 12:16:13 -07:00 committed by Android (Google) Code Review
commit aeb76d160c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
services/surfaceflinger/DisplayHardware/HWComposer.cpp
View File

@ -648,7 +648,7 @@ status_t HWComposer::acquire() const {
} }
int HWComposer::getVisualID() const { int HWComposer::getVisualID() const {
if (hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_1)) { if (mHwc && hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_1)) {
// FIXME: temporary hack until HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED // FIXME: temporary hack until HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED
// is supported by the implementation. we can only be in this case // is supported by the implementation. we can only be in this case
// if we have HWC 1.1 // if we have HWC 1.1
@ -665,7 +665,7 @@ bool HWComposer::supportsFramebufferTarget() const {
int HWComposer::fbPost(int32_t id, int HWComposer::fbPost(int32_t id,
const sp<Fence>& acquireFence, const sp<GraphicBuffer>& buffer) { const sp<Fence>& acquireFence, const sp<GraphicBuffer>& buffer) {
if (hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_1)) { if (mHwc && hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_1)) {
return setFramebufferTarget(id, acquireFence, buffer); return setFramebufferTarget(id, acquireFence, buffer);
} else { } else {
if (acquireFence != NULL) { if (acquireFence != NULL) {
@ -676,7 +676,7 @@ int HWComposer::fbPost(int32_t id,
} }
int HWComposer::fbCompositionComplete() { int HWComposer::fbCompositionComplete() {
if (hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_1)) if (mHwc && hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_1))
return NO_ERROR; return NO_ERROR;
if (mFbDev->compositionComplete) { if (mFbDev->compositionComplete) {