diff options
| author | Narayan Kamath <narayan@google.com> | 2014-03-11 18:16:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-11 18:16:59 +0000 |
| commit | 2d895e6344f7999e98f05652f7679f2d96374b78 (patch) | |
| tree | 881da04e4767597f6ecbbf99663027669455cf5d /core/jni | |
| parent | 3489aa9a0da1288ac480fe2db1f7b7fe5ef1ab0e (diff) | |
| parent | 8fb22ae772fc62a10db6a06f283140d9233e8704 (diff) | |
| download | frameworks_base-2d895e6344f7999e98f05652f7679f2d96374b78.zip frameworks_base-2d895e6344f7999e98f05652f7679f2d96374b78.tar.gz frameworks_base-2d895e6344f7999e98f05652f7679f2d96374b78.tar.bz2 | |
am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit"
* commit '8fb22ae772fc62a10db6a06f283140d9233e8704':
Various format string fixes for 64bit
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_media_AudioRecord.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/jni/android_media_AudioRecord.cpp b/core/jni/android_media_AudioRecord.cpp index b22668b..ab70f25 100644 --- a/core/jni/android_media_AudioRecord.cpp +++ b/core/jni/android_media_AudioRecord.cpp @@ -18,6 +18,7 @@ #define LOG_TAG "AudioRecord-JNI" +#include <inttypes.h> #include <jni.h> #include <JNIHelp.h> #include <android_runtime/AndroidRuntime.h> @@ -316,7 +317,7 @@ static void android_media_AudioRecord_release(JNIEnv *env, jobject thiz) { if (lpRecorder == NULL) { return; } - ALOGV("About to delete lpRecorder: %x\n", (int)lpRecorder.get()); + ALOGV("About to delete lpRecorder: %" PRIxPTR "\n", lpRecorder.get()); lpRecorder->stop(); audiorecord_callback_cookie *lpCookie = (audiorecord_callback_cookie *)env->GetLongField( @@ -329,7 +330,7 @@ static void android_media_AudioRecord_release(JNIEnv *env, jobject thiz) { // delete the callback information if (lpCookie) { Mutex::Autolock l(sLock); - ALOGV("deleting lpCookie: %x\n", (int)lpCookie); + ALOGV("deleting lpCookie: %" PRIxPTR "\n", lpCookie); while (lpCookie->busy) { if (lpCookie->cond.waitRelative(sLock, milliseconds(CALLBACK_COND_WAIT_TIMEOUT_MS)) != |