commit d6f549f92541d8ab947fe35e3b3c21133eed2a6f
author Mathias Agopian <mathias@google.com> Tue Feb 26 00:53:13 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 26 00:53:13 2013 +0000
tree 4ab138e80b7ee719589037d19f4f6b30fcadbde3
parent 789a6c3f1dfe22a1ffea7f39b2098d7842cd1f30
parent bf13ba5e77804ca7466acb7100cdaf7c14cc0fb7

Merge "add some missing parameter validation in GLES java bindings" into jb-mr2-dev

services/surfaceflinger/Layer.cpp

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