diff options
| author | Andy McFadden <fadden@android.com> | 2012-09-12 13:27:00 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-12 13:27:01 -0700 |
| commit | 2c7c8ba56ad9c0c08fde6f86771475f03a03e6fd (patch) | |
| tree | 6837f3a35bc8a3ab7afeb089e4cbed216769be77 | |
| parent | c272430960047de4e9b2f169fb053bd0aedce3b1 (diff) | |
| parent | babba1868773eba5edf8a8e335b8e109a32292e0 (diff) | |
| download | frameworks_native-2c7c8ba56ad9c0c08fde6f86771475f03a03e6fd.zip frameworks_native-2c7c8ba56ad9c0c08fde6f86771475f03a03e6fd.tar.gz frameworks_native-2c7c8ba56ad9c0c08fde6f86771475f03a03e6fd.tar.bz2 | |
Merge "Fix emulator" into jb-mr1-dev
| -rw-r--r-- | services/surfaceflinger/DisplayHardware/HWComposer.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp index 75b8ad8..992d067 100644 --- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp +++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp @@ -111,9 +111,10 @@ HWComposer::HWComposer( loadFbHalModule(); loadHwcModule(); - if (!hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_1) && !mFbDev) { + // If we have no HWC, or a pre-1.1 HWC, an FB dev is mandatory. + if ((!mHwc || !hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_1)) + && !mFbDev) { ALOGE("ERROR: failed to open framebuffer, aborting"); - // FB mandatory on <= 1.0, give up abort(); } @@ -186,7 +187,9 @@ HWComposer::HWComposer( } HWComposer::~HWComposer() { - mHwc->eventControl(mHwc, 0, EVENT_VSYNC, 0); + if (mHwc) { + mHwc->eventControl(mHwc, 0, EVENT_VSYNC, 0); + } if (mVSyncThread != NULL) { mVSyncThread->requestExitAndWait(); } |