summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2015-05-28 09:34:20 -0700
committerGlenn Kasten <gkasten@google.com>2015-05-28 11:34:47 -0700
commitbaa2db446c404a4443a8e455a412753fc92ed036 (patch)
tree923e352bc20ea2d26800665750727318ebb2014d
parent03d4a5ae486538839d02ae8a18e2a5c38bf1e2fb (diff)
downloadandroid_frameworks_wilhelm-baa2db446c404a4443a8e455a412753fc92ed036.tar.gz
android_frameworks_wilhelm-baa2db446c404a4443a8e455a412753fc92ed036.tar.bz2
android_frameworks_wilhelm-baa2db446c404a4443a8e455a412753fc92ed036.zip
Explicitly compare raw pointers to NULL
Change-Id: I6e867fea4067e0e0497d91c0750bbdcbe44d7f7a
-rw-r--r--src/android/AudioPlayer_to_android.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/android/AudioPlayer_to_android.cpp b/src/android/AudioPlayer_to_android.cpp
index 744dda8..1647a34 100644
--- a/src/android/AudioPlayer_to_android.cpp
+++ b/src/android/AudioPlayer_to_android.cpp
@@ -987,20 +987,20 @@ SLresult android_audioPlayer_checkSourceSink(CAudioPlayer *pAudioPlayer)
}
switch (df_pcm->bitsPerSample) {
case SL_PCMSAMPLEFORMAT_FIXED_8:
- if (df_representation &&
+ if (df_representation != NULL &&
*df_representation != SL_ANDROID_PCM_REPRESENTATION_UNSIGNED_INT) {
goto default_err;
}
break;
case SL_PCMSAMPLEFORMAT_FIXED_16:
case SL_PCMSAMPLEFORMAT_FIXED_24:
- if (df_representation &&
+ if (df_representation != NULL &&
*df_representation != SL_ANDROID_PCM_REPRESENTATION_SIGNED_INT) {
goto default_err;
}
break;
case SL_PCMSAMPLEFORMAT_FIXED_32:
- if (df_representation
+ if (df_representation != NULL
&& *df_representation != SL_ANDROID_PCM_REPRESENTATION_SIGNED_INT
&& *df_representation != SL_ANDROID_PCM_REPRESENTATION_FLOAT) {
goto default_err;