ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

am 789a6c3f: SurfaceFlinger: fix a couple NULL fence checks

Browse Source 
* commit '789a6c3f1dfe22a1ffea7f39b2098d7842cd1f30':
  SurfaceFlinger: fix a couple NULL fence checks
This commit is contained in:
Jamie Gennis 2013-02-25 23:40:36 +00:00 committed by Android Git Automerger
commit 6c6d1fd07b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
services/surfaceflinger/Layer.cpp
View File

@ -526,7 +526,7 @@ void Layer::onPostComposition() {
mFrameTracker.setDesiredPresentTime(desiredPresentTime); mFrameTracker.setDesiredPresentTime(desiredPresentTime);
sp<Fence> frameReadyFence = mSurfaceFlingerConsumer->getCurrentFence(); sp<Fence> frameReadyFence = mSurfaceFlingerConsumer->getCurrentFence();
if (frameReadyFence != NULL) { if (frameReadyFence->isValid()) {
mFrameTracker.setFrameReadyFence(frameReadyFence); mFrameTracker.setFrameReadyFence(frameReadyFence);
} else { } else {
// There was no fence for this frame, so assume that it was ready // There was no fence for this frame, so assume that it was ready
@ -536,7 +536,7 @@ void Layer::onPostComposition() {
const HWComposer& hwc = mFlinger->getHwComposer(); const HWComposer& hwc = mFlinger->getHwComposer();
sp<Fence> presentFence = hwc.getDisplayFence(HWC_DISPLAY_PRIMARY); sp<Fence> presentFence = hwc.getDisplayFence(HWC_DISPLAY_PRIMARY);
if (presentFence != NULL) { if (presentFence->isValid()) {
mFrameTracker.setActualPresentFence(presentFence); mFrameTracker.setActualPresentFence(presentFence);
} else { } else {
// The HWC doesn't support present fences, so use the refresh // The HWC doesn't support present fences, so use the refresh