commit 937098b9b564a779ff1c8c2d9e60769ee5c69810
author Glenn Kasten <gkasten@google.com> Wed Jun 26 11:19:36 2013 -0700
committer Glenn Kasten <gkasten@google.com> Tue Aug 06 14:04:56 2013 -0700
tree 687e9fee2acde8204b60e3221234b992b311fb12
parent 5279e3e1187e4da0fed4349d29ea548f52e95f95

Use 0 for sp<>, NULL for raw pointers

Change-Id: Ia0595afdc41e1dec428d7a3db73558b54c417bf3

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 3d65c44..0bbe665 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -1424,7 +1424,7 @@
     config.sample_rate = (pSamplingRate != NULL) ? *pSamplingRate : 0;
     config.channel_mask = (pChannelMask != NULL) ? *pChannelMask : 0;
     config.format = (pFormat != NULL) ? *pFormat : AUDIO_FORMAT_DEFAULT;
-    if (offloadInfo) {
+    if (offloadInfo != NULL) {
         config.offload_info = *offloadInfo;
     }
 

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 2c2931f..fcdea91 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -1248,7 +1248,7 @@
             track = TimedTrack::create(this, client, streamType, sampleRate, format,
                     channelMask, frameCount, sharedBuffer, sessionId);
         }
-        if (track == 0 || track->getCblk() == NULL || track->name() < 0) {
+        if (track == 0 || track->getCblk() == 0 || track->name() < 0) {
             lStatus = NO_MEMORY;
             goto Exit;
         }