diff options
author | Steve Block <steveblock@google.com> | 2012-01-06 19:20:56 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2012-01-08 13:19:13 +0000 |
commit | 3762c311729fe9f3af085c14c5c1fb471d994c03 (patch) | |
tree | 7d4caccad80ac7327c7bff96dafc857d5f4631ad /media/jni/soundpool | |
parent | 7a939077bd14521c7d351af98df7ed75a8ec9c15 (diff) | |
download | frameworks_base-3762c311729fe9f3af085c14c5c1fb471d994c03.zip frameworks_base-3762c311729fe9f3af085c14c5c1fb471d994c03.tar.gz frameworks_base-3762c311729fe9f3af085c14c5c1fb471d994c03.tar.bz2 |
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220
Bug: 5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
Diffstat (limited to 'media/jni/soundpool')
-rw-r--r-- | media/jni/soundpool/SoundPool.cpp | 8 | ||||
-rw-r--r-- | media/jni/soundpool/android_media_SoundPool.cpp | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/media/jni/soundpool/SoundPool.cpp b/media/jni/soundpool/SoundPool.cpp index ed63189..14a5309 100644 --- a/media/jni/soundpool/SoundPool.cpp +++ b/media/jni/soundpool/SoundPool.cpp @@ -508,19 +508,19 @@ status_t Sample::doLoad() mFd = -1; } if (p == 0) { - LOGE("Unable to load sample: %s", mUrl); + ALOGE("Unable to load sample: %s", mUrl); return -1; } ALOGV("pointer = %p, size = %u, sampleRate = %u, numChannels = %d", p->pointer(), p->size(), sampleRate, numChannels); if (sampleRate > kMaxSampleRate) { - LOGE("Sample rate (%u) out of range", sampleRate); + ALOGE("Sample rate (%u) out of range", sampleRate); return - 1; } if ((numChannels < 1) || (numChannels > 2)) { - LOGE("Sample channel count (%d) out of range", numChannels); + ALOGE("Sample channel count (%d) out of range", numChannels); return - 1; } @@ -616,7 +616,7 @@ void SoundChannel::play(const sp<Sample>& sample, int nextChannelID, float leftV oldTrack = mAudioTrack; status = newTrack->initCheck(); if (status != NO_ERROR) { - LOGE("Error creating AudioTrack"); + ALOGE("Error creating AudioTrack"); goto exit; } ALOGV("setVolume %p", newTrack); diff --git a/media/jni/soundpool/android_media_SoundPool.cpp b/media/jni/soundpool/android_media_SoundPool.cpp index f86892f..fe1c20a 100644 --- a/media/jni/soundpool/android_media_SoundPool.cpp +++ b/media/jni/soundpool/android_media_SoundPool.cpp @@ -288,27 +288,27 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) jclass clazz; if (vm->GetEnv((void**) &env, JNI_VERSION_1_4) != JNI_OK) { - LOGE("ERROR: GetEnv failed\n"); + ALOGE("ERROR: GetEnv failed\n"); goto bail; } assert(env != NULL); clazz = env->FindClass(kClassPathName); if (clazz == NULL) { - LOGE("Can't find %s", kClassPathName); + ALOGE("Can't find %s", kClassPathName); goto bail; } fields.mNativeContext = env->GetFieldID(clazz, "mNativeContext", "I"); if (fields.mNativeContext == NULL) { - LOGE("Can't find SoundPool.mNativeContext"); + ALOGE("Can't find SoundPool.mNativeContext"); goto bail; } fields.mPostEvent = env->GetStaticMethodID(clazz, "postEventFromNative", "(Ljava/lang/Object;IIILjava/lang/Object;)V"); if (fields.mPostEvent == NULL) { - LOGE("Can't find android/media/SoundPool.postEventFromNative"); + ALOGE("Can't find android/media/SoundPool.postEventFromNative"); goto bail; } |