Merge "sf: Fix incorrect state reporting in dumpsys"
This commit is contained in:
commit
2b5b55e73c
@ -635,6 +635,7 @@ status_t HWComposer::setFramebufferTarget(int32_t id,
|
||||
}
|
||||
|
||||
status_t HWComposer::prepare() {
|
||||
Mutex::Autolock _l(mDisplayLock);
|
||||
for (size_t i=0 ; i<mNumDisplays ; i++) {
|
||||
DisplayData& disp(mDisplayData[i]);
|
||||
if (disp.framebufferTarget) {
|
||||
@ -1145,6 +1146,7 @@ static String8 getFormatStr(PixelFormat format) {
|
||||
}
|
||||
|
||||
void HWComposer::dump(String8& result) const {
|
||||
Mutex::Autolock _l(mDisplayLock);
|
||||
if (mHwc) {
|
||||
result.appendFormat("Hardware Composer state (version %08x):\n", hwcApiVersion(mHwc));
|
||||
result.appendFormat(" mDebugForceFakeVSync=%d\n", mDebugForceFakeVSync);
|
||||
|
@ -354,6 +354,8 @@ private:
|
||||
// mLists[i>0] can be NULL. that display is to be ignored
|
||||
struct hwc_display_contents_1* mLists[MAX_HWC_DISPLAYS];
|
||||
DisplayData mDisplayData[MAX_HWC_DISPLAYS];
|
||||
// protect mDisplayData from races between prepare and dump
|
||||
mutable Mutex mDisplayLock;
|
||||
size_t mNumDisplays;
|
||||
|
||||
cb_context* mCBContext;
|
||||
|
Loading…
Reference in New Issue
Block a user