diff options
| author | Jesse Hall <jessehall@google.com> | 2012-09-18 11:39:40 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2012-09-18 14:28:25 -0700 |
| commit | ef27e9cea08c0f33cf64891a453510b0398d86e8 (patch) | |
| tree | 5ca4ca2d0866a9b61907951b20e22062489d0a90 | |
| parent | 336768a935c231b51dac19ffffaf2bf4e9bd5414 (diff) | |
| download | frameworks_native-ef27e9cea08c0f33cf64891a453510b0398d86e8.zip frameworks_native-ef27e9cea08c0f33cf64891a453510b0398d86e8.tar.gz frameworks_native-ef27e9cea08c0f33cf64891a453510b0398d86e8.tar.bz2 | |
Check that HWC exists before trying to use it
Bug: 7185810
Change-Id: I1271d6ba397f3abf0ef166b8d03b9b26b72e28d7
| -rw-r--r-- | services/surfaceflinger/DisplayHardware/HWComposer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp index 9c04fc0..8d07722 100644 --- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp +++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp @@ -648,7 +648,7 @@ status_t HWComposer::acquire() 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 // is supported by the implementation. we can only be in this case // if we have HWC 1.1 @@ -665,7 +665,7 @@ bool HWComposer::supportsFramebufferTarget() const { int HWComposer::fbPost(int32_t id, 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); } else { if (acquireFence != NULL) { @@ -676,7 +676,7 @@ int HWComposer::fbPost(int32_t id, } 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; if (mFbDev->compositionComplete) { |