| Revision | 78041bb45a808d3214e61d2960f4a2e31209fd54 (tree) |
|---|---|
| Zeit | 2016-10-11 07:31:05 |
| Autor | Jaap Jan Meijer <jjmeijer88@gmai...> |
| Commiter | Jaap Jan Meijer |
Merge remote-tracking branch 'cm/cm-14.0' into cm-14.0-x86
libs/gui/tests/BufferQueue_test.cpp (diff) services/surfaceflinger/Layer.cpp (diff)| @@ -904,7 +904,7 @@ TEST_F(BufferQueueTest, TestDiscardFreeBuffers) { | ||
| 904 | 904 | |
| 905 | 905 | // Check no free buffers in dump |
| 906 | 906 | String8 dumpString; |
| 907 | - mConsumer->dump(dumpString, nullptr); | |
| 907 | + mConsumer->dumpState(dumpString, nullptr); | |
| 908 | 908 | |
| 909 | 909 | // Parse the dump to ensure that all buffer slots that are FREE also |
| 910 | 910 | // have a null GraphicBuffer |
| @@ -735,6 +735,13 @@ void Layer::setPerFrameData(const sp<const DisplayDevice>& displayDevice) { | ||
| 735 | 735 | (mActiveBuffer != nullptr && mActiveBuffer->handle == nullptr)) { |
| 736 | 736 | ALOGV("[%s] Requesting Client composition", mName.string()); |
| 737 | 737 | setCompositionType(hwcId, HWC2::Composition::Client); |
| 738 | +#ifndef USE_HWC2 | |
| 739 | + error = hwcLayer->setBuffer(nullptr, Fence::NO_FENCE); | |
| 740 | + if (error != HWC2::Error::None) { | |
| 741 | + ALOGE("[%s] Failed to set null buffer: %s (%d)", mName.string(), | |
| 742 | + to_string(error).c_str(), static_cast<int32_t>(error)); | |
| 743 | + } | |
| 744 | +#endif | |
| 738 | 745 | return; |
| 739 | 746 | } |
| 740 | 747 |
Android-x86
Fork