OSDN Git Service

SurfaceFlinger: fix a couple NULL fence checks
authorJamie Gennis <jgennis@google.com>
Mon, 25 Feb 2013 21:37:54 +0000 (13:37 -0800)
committerThe Android Automerger <android-build@android.com>
Tue, 26 Feb 2013 01:05:12 +0000 (17:05 -0800)
This change replaces checks for a NULL fence pointer with calls to
Fence::isValid.  There should no longer be NULL fences.

Change-Id: If17c9c132fcb1801531bf7588f8ba53476c57dad

services/surfaceflinger/Layer.cpp

index 1401154..439acb5 100644 (file)
@@ -526,7 +526,7 @@ void Layer::onPostComposition() {
         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 @@ void Layer::onPostComposition() {
 
         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