Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Wait until old ComposerClient is fully destroyed before recreating" into qt-dev

Browse Source 
am: d93c9f0c2d

Change-Id: I3bda1337b6c3fdea3c555f3887aa9a88dc04620c
This commit is contained in:
Valerie Hau
2019-06-21 15:20:16 -07:00
committed by android-build-merger
parent a5bd3ffd11 d93c9f0c2d
commit 5cb7cc40a7
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
graphics/composer/2.1/utils/hal/include/composer-hal/2.1/Composer.h
View File

@@ -109,12 +109,10 @@ class ComposerImpl : public Interface {
// inverted (create and then destroy). Wait for a brief period to
// see if the existing client is destroyed.
ALOGD("waiting for previous client to be destroyed");
mClientDestroyedCondition.wait_for(
lock, 1s, [this]() -> bool { return mClient.promote() == nullptr; });
if (mClient.promote() != nullptr) {
mClientDestroyedCondition.wait_for(lock, 1s,
[this]() -> bool { return mClient == nullptr; });
if (mClient != nullptr) {
ALOGD("previous client was not destroyed");
} else {
mClient.clear();
}
}