diff options
| author | 2012-02-08 07:41:44 -0800 | |
|---|---|---|
| committer | 2012-02-08 07:41:44 -0800 | |
| commit | 01a802692f6bf2c97a623683d073e949af61d7a9 (patch) | |
| tree | 1f3d84a8c4c5ad64ad93bb9bb8d97049cff6b8e5 /services/audioflinger/AudioPolicyService.cpp | |
| parent | 35624c17973a941fe000026d899f065c1155021b (diff) | |
| parent | 706b618c1293848e736d974869136caadeb353c0 (diff) | |
Merge "Use 0 not NULL for sp<> and wp<>"
Diffstat (limited to 'services/audioflinger/AudioPolicyService.cpp')
| -rw-r--r-- | services/audioflinger/AudioPolicyService.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/services/audioflinger/AudioPolicyService.cpp b/services/audioflinger/AudioPolicyService.cpp index 1dddbb315b19..755f51f51dd2 100644 --- a/services/audioflinger/AudioPolicyService.cpp +++ b/services/audioflinger/AudioPolicyService.cpp @@ -1362,7 +1362,7 @@ static audio_io_handle_t aps_open_output(void *service, audio_policy_output_flags_t flags) { sp<IAudioFlinger> af = AudioSystem::get_audio_flinger(); - if (af == NULL) { + if (af == 0) { ALOGW("%s: could not get AudioFlinger", __func__); return 0; } @@ -1376,7 +1376,7 @@ static audio_io_handle_t aps_open_dup_output(void *service, audio_io_handle_t output2) { sp<IAudioFlinger> af = AudioSystem::get_audio_flinger(); - if (af == NULL) { + if (af == 0) { ALOGW("%s: could not get AudioFlinger", __func__); return 0; } @@ -1386,7 +1386,7 @@ static audio_io_handle_t aps_open_dup_output(void *service, static int aps_close_output(void *service, audio_io_handle_t output) { sp<IAudioFlinger> af = AudioSystem::get_audio_flinger(); - if (af == NULL) + if (af == 0) return PERMISSION_DENIED; return af->closeOutput(output); @@ -1395,7 +1395,7 @@ static int aps_close_output(void *service, audio_io_handle_t output) static int aps_suspend_output(void *service, audio_io_handle_t output) { sp<IAudioFlinger> af = AudioSystem::get_audio_flinger(); - if (af == NULL) { + if (af == 0) { ALOGW("%s: could not get AudioFlinger", __func__); return PERMISSION_DENIED; } @@ -1406,7 +1406,7 @@ static int aps_suspend_output(void *service, audio_io_handle_t output) static int aps_restore_output(void *service, audio_io_handle_t output) { sp<IAudioFlinger> af = AudioSystem::get_audio_flinger(); - if (af == NULL) { + if (af == 0) { ALOGW("%s: could not get AudioFlinger", __func__); return PERMISSION_DENIED; } @@ -1422,7 +1422,7 @@ static audio_io_handle_t aps_open_input(void *service, audio_in_acoustics_t acoustics) { sp<IAudioFlinger> af = AudioSystem::get_audio_flinger(); - if (af == NULL) { + if (af == 0) { ALOGW("%s: could not get AudioFlinger", __func__); return 0; } @@ -1434,7 +1434,7 @@ static audio_io_handle_t aps_open_input(void *service, static int aps_close_input(void *service, audio_io_handle_t input) { sp<IAudioFlinger> af = AudioSystem::get_audio_flinger(); - if (af == NULL) + if (af == 0) return PERMISSION_DENIED; return af->closeInput(input); @@ -1444,7 +1444,7 @@ static int aps_set_stream_output(void *service, audio_stream_type_t stream, audio_io_handle_t output) { sp<IAudioFlinger> af = AudioSystem::get_audio_flinger(); - if (af == NULL) + if (af == 0) return PERMISSION_DENIED; return af->setStreamOutput(stream, output); @@ -1455,7 +1455,7 @@ static int aps_move_effects(void *service, int session, audio_io_handle_t dst_output) { sp<IAudioFlinger> af = AudioSystem::get_audio_flinger(); - if (af == NULL) + if (af == 0) return PERMISSION_DENIED; return af->moveEffects(session, (int)src_output, (int)dst_output); |