diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-20 14:14:02 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-20 14:14:02 -0800 |
| commit | d375394752c707a6b153c613448abf13b771f9b4 (patch) | |
| tree | f8aaaf3c849d2e6becdf2ff0823a9d7b088b3324 | |
| parent | b4ae95519a29f2b0a9cc34f72a9b3a7733cdb90f (diff) | |
| parent | ea46649a1cce7447ece812e60168f2bb3db47122 (diff) | |
| download | frameworks_base-d375394752c707a6b153c613448abf13b771f9b4.zip frameworks_base-d375394752c707a6b153c613448abf13b771f9b4.tar.gz frameworks_base-d375394752c707a6b153c613448abf13b771f9b4.tar.bz2 | |
am ea46649a: Merge "Remove redundant get()"
* commit 'ea46649a1cce7447ece812e60168f2bb3db47122':
Remove redundant get()
| -rw-r--r-- | media/libmedia/AudioSystem.cpp | 4 | ||||
| -rw-r--r-- | media/libmedia/IMediaDeathNotifier.cpp | 2 | ||||
| -rw-r--r-- | media/libmedia/mediametadataretriever.cpp | 2 | ||||
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index d4ecb3a..5ca868a 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -49,7 +49,7 @@ size_t AudioSystem::gInBuffSize = 0; const sp<IAudioFlinger>& AudioSystem::get_audio_flinger() { Mutex::Autolock _l(gLock); - if (gAudioFlinger.get() == 0) { + if (gAudioFlinger == 0) { sp<IServiceManager> sm = defaultServiceManager(); sp<IBinder> binder; do { @@ -499,7 +499,7 @@ sp<AudioSystem::AudioPolicyServiceClient> AudioSystem::gAudioPolicyServiceClient const sp<IAudioPolicyService>& AudioSystem::get_audio_policy_service() { gLock.lock(); - if (gAudioPolicyService.get() == 0) { + if (gAudioPolicyService == 0) { sp<IServiceManager> sm = defaultServiceManager(); sp<IBinder> binder; do { diff --git a/media/libmedia/IMediaDeathNotifier.cpp b/media/libmedia/IMediaDeathNotifier.cpp index 8525482..aeb35a5 100644 --- a/media/libmedia/IMediaDeathNotifier.cpp +++ b/media/libmedia/IMediaDeathNotifier.cpp @@ -36,7 +36,7 @@ IMediaDeathNotifier::getMediaPlayerService() { ALOGV("getMediaPlayerService"); Mutex::Autolock _l(sServiceLock); - if (sMediaPlayerService.get() == 0) { + if (sMediaPlayerService == 0) { sp<IServiceManager> sm = defaultServiceManager(); sp<IBinder> binder; do { diff --git a/media/libmedia/mediametadataretriever.cpp b/media/libmedia/mediametadataretriever.cpp index 88e269f..8d53357 100644 --- a/media/libmedia/mediametadataretriever.cpp +++ b/media/libmedia/mediametadataretriever.cpp @@ -35,7 +35,7 @@ sp<MediaMetadataRetriever::DeathNotifier> MediaMetadataRetriever::sDeathNotifier const sp<IMediaPlayerService>& MediaMetadataRetriever::getService() { Mutex::Autolock lock(sServiceLock); - if (sService.get() == 0) { + if (sService == 0) { sp<IServiceManager> sm = defaultServiceManager(); sp<IBinder> binder; do { diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index e2e5214..53b13f7 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -801,7 +801,7 @@ status_t AudioFlinger::setParameters(int ioHandle, const String8& keyValuePairs) thread = checkPlaybackThread_l(ioHandle); if (thread == NULL) { thread = checkRecordThread_l(ioHandle); - } else if (thread.get() == primaryPlaybackThread_l()) { + } else if (thread == primaryPlaybackThread_l()) { // indicate output device change to all input threads for pre processing AudioParameter param = AudioParameter(keyValuePairs); int value; @@ -5760,7 +5760,7 @@ sp<AudioFlinger::EffectHandle> AudioFlinger::ThreadBase::createEffect_l( effect = chain->getEffectFromDesc_l(desc); } - ALOGV("createEffect_l() got effect %p on chain %p", effect == 0 ? 0 : effect.get(), chain.get()); + ALOGV("createEffect_l() got effect %p on chain %p", effect.get(), chain.get()); if (effect == 0) { int id = mAudioFlinger->nextUniqueId(); |