diff options
| author | 2017-02-17 18:06:22 +0000 | |
|---|---|---|
| committer | 2017-02-17 18:06:22 +0000 | |
| commit | ff70fd8e02445f61fc0f2611e4862537713d2476 (patch) | |
| tree | 93634944530bca1e3938bd9b73dfa97b3f1e4904 /libs/gui/ConsumerBase.cpp | |
| parent | 89eba3681aa55865b933b451689d0cc4306bb6e4 (diff) | |
| parent | a34320a81c9787958f1b02e93e828472e54864b5 (diff) | |
Merge "libui: Remove STL from Fence"
Diffstat (limited to 'libs/gui/ConsumerBase.cpp')
| -rw-r--r-- | libs/gui/ConsumerBase.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/gui/ConsumerBase.cpp b/libs/gui/ConsumerBase.cpp index be2b1afd36..c26de6673b 100644 --- a/libs/gui/ConsumerBase.cpp +++ b/libs/gui/ConsumerBase.cpp @@ -318,16 +318,16 @@ status_t ConsumerBase::addReleaseFenceLocked(int slot, return OK; } - auto signaled = mSlots[slot].mFence->hasSignaled(); + auto status = mSlots[slot].mFence->getStatus(); - if (!signaled) { + if (status == Fence::Status::Invalid) { CB_LOGE("fence has invalid state"); return BAD_VALUE; } - if (*signaled) { + if (status == Fence::Status::Signaled) { mSlots[slot].mFence = fence; - } else { + } else { // status == Fence::Status::Unsignaled char fenceName[32] = {}; snprintf(fenceName, 32, "%.28s:%d", mName.string(), slot); sp<Fence> mergedFence = Fence::merge( |