diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2012-01-19 17:18:25 -0800 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2012-01-19 17:18:25 -0800 |
commit | 97aa8ee81198234aedffceaf71ad216b96323393 (patch) | |
tree | b5f311825b206befcb8b4bf35ac7b09197fd40cf /core | |
parent | 36b48c30adf7236b00eccf87f3b5691359526540 (diff) | |
parent | ee4618bc4da65fdabf197874e87d2923904e7acd (diff) | |
download | frameworks_base-97aa8ee81198234aedffceaf71ad216b96323393.zip frameworks_base-97aa8ee81198234aedffceaf71ad216b96323393.tar.gz frameworks_base-97aa8ee81198234aedffceaf71ad216b96323393.tar.bz2 |
Merge ee4618bc
Change-Id: Ie1dc6ad38e7c30636d80f6caef11cf6673144940
Diffstat (limited to 'core')
21 files changed, 293 insertions, 293 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index c00e6c9..6d1410c 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -708,7 +708,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) opt.optionString = enableAssertBuf; mOptions.add(opt); } else { - LOGV("Assertions disabled\n"); + ALOGV("Assertions disabled\n"); } if (jniOptsBuf[10] != '\0') { @@ -897,7 +897,7 @@ void AndroidRuntime::start(const char* className, const char* options) void AndroidRuntime::onExit(int code) { - LOGV("AndroidRuntime onExit calling exit(%d)", code); + ALOGV("AndroidRuntime onExit calling exit(%d)", code); exit(code); } @@ -1217,7 +1217,7 @@ static const RegJNIRec gRegJNI[] = { */ androidSetCreateThreadFunc((android_create_thread_fn) javaCreateThreadEtc); - LOGV("--- registering native functions ---\n"); + ALOGV("--- registering native functions ---\n"); /* * Every "register" function calls one or more things that return diff --git a/core/jni/android/graphics/NinePatch.cpp b/core/jni/android/graphics/NinePatch.cpp index 0c8a8a3..f3b28a9 100644 --- a/core/jni/android/graphics/NinePatch.cpp +++ b/core/jni/android/graphics/NinePatch.cpp @@ -82,7 +82,7 @@ public: if (destDensity == srcDensity || destDensity == 0 || srcDensity == 0) { - LOGV("Drawing unscaled 9-patch: (%g,%g)-(%g,%g)", + ALOGV("Drawing unscaled 9-patch: (%g,%g)-(%g,%g)", SkScalarToFloat(bounds.fLeft), SkScalarToFloat(bounds.fTop), SkScalarToFloat(bounds.fRight), SkScalarToFloat(bounds.fBottom)); NinePatch_Draw(canvas, bounds, *bitmap, *chunk, paint, NULL); @@ -97,7 +97,7 @@ public: bounds.fBottom = SkScalarDiv(bounds.fBottom-bounds.fTop, scale); bounds.fLeft = bounds.fTop = 0; - LOGV("Drawing scaled 9-patch: (%g,%g)-(%g,%g) srcDensity=%d destDensity=%d", + ALOGV("Drawing scaled 9-patch: (%g,%g)-(%g,%g) srcDensity=%d destDensity=%d", SkScalarToFloat(bounds.fLeft), SkScalarToFloat(bounds.fTop), SkScalarToFloat(bounds.fRight), SkScalarToFloat(bounds.fBottom), srcDensity, destDensity); diff --git a/core/jni/android/graphics/NinePatchImpl.cpp b/core/jni/android/graphics/NinePatchImpl.cpp index a3e36ee..7aaca8a 100644 --- a/core/jni/android/graphics/NinePatchImpl.cpp +++ b/core/jni/android/graphics/NinePatchImpl.cpp @@ -135,7 +135,7 @@ void NinePatch_Draw(SkCanvas* canvas, const SkRect& bounds, #ifdef USE_TRACE if (canvas) { const SkMatrix& m = canvas->getTotalMatrix(); - LOGV("ninepatch [%g %g %g] [%g %g %g]\n", + ALOGV("ninepatch [%g %g %g] [%g %g %g]\n", SkScalarToFloat(m[0]), SkScalarToFloat(m[1]), SkScalarToFloat(m[2]), SkScalarToFloat(m[3]), SkScalarToFloat(m[4]), SkScalarToFloat(m[5])); } @@ -143,10 +143,10 @@ void NinePatch_Draw(SkCanvas* canvas, const SkRect& bounds, #ifdef USE_TRACE if (gTrace) { - LOGV("======== ninepatch bounds [%g %g]\n", SkScalarToFloat(bounds.width()), SkScalarToFloat(bounds.height())); - LOGV("======== ninepatch paint bm [%d,%d]\n", bitmap.width(), bitmap.height()); - LOGV("======== ninepatch xDivs [%d,%d]\n", chunk.xDivs[0], chunk.xDivs[1]); - LOGV("======== ninepatch yDivs [%d,%d]\n", chunk.yDivs[0], chunk.yDivs[1]); + ALOGV("======== ninepatch bounds [%g %g]\n", SkScalarToFloat(bounds.width()), SkScalarToFloat(bounds.height())); + ALOGV("======== ninepatch paint bm [%d,%d]\n", bitmap.width(), bitmap.height()); + ALOGV("======== ninepatch xDivs [%d,%d]\n", chunk.xDivs[0], chunk.xDivs[1]); + ALOGV("======== ninepatch yDivs [%d,%d]\n", chunk.yDivs[0], chunk.yDivs[1]); } #endif @@ -155,7 +155,7 @@ void NinePatch_Draw(SkCanvas* canvas, const SkRect& bounds, (paint && paint->getXfermode() == NULL && paint->getAlpha() == 0)) { #ifdef USE_TRACE - if (gTrace) LOGV("======== abort ninepatch draw\n"); + if (gTrace) ALOGV("======== abort ninepatch draw\n"); #endif return; } @@ -201,7 +201,7 @@ void NinePatch_Draw(SkCanvas* canvas, const SkRect& bounds, int numFixedYPixelsRemaining = bitmapHeight - numStretchyYPixelsRemaining; #ifdef USE_TRACE - LOGV("NinePatch [%d %d] bounds [%g %g %g %g] divs [%d %d]\n", + ALOGV("NinePatch [%d %d] bounds [%g %g %g %g] divs [%d %d]\n", bitmap.width(), bitmap.height(), SkScalarToFloat(bounds.fLeft), SkScalarToFloat(bounds.fTop), SkScalarToFloat(bounds.width()), SkScalarToFloat(bounds.height()), @@ -305,12 +305,12 @@ void NinePatch_Draw(SkCanvas* canvas, const SkRect& bounds, } if (canvas) { #ifdef USE_TRACE - LOGV("-- src [%d %d %d %d] dst [%g %g %g %g]\n", + ALOGV("-- src [%d %d %d %d] dst [%g %g %g %g]\n", src.fLeft, src.fTop, src.width(), src.height(), SkScalarToFloat(dst.fLeft), SkScalarToFloat(dst.fTop), SkScalarToFloat(dst.width()), SkScalarToFloat(dst.height())); if (2 == src.width() && SkIntToScalar(5) == dst.width()) { - LOGV("--- skip patch\n"); + ALOGV("--- skip patch\n"); } #endif drawStretchyPatch(canvas, src, dst, bitmap, *paint, initColor, diff --git a/core/jni/android_bluetooth_BluetoothAudioGateway.cpp b/core/jni/android_bluetooth_BluetoothAudioGateway.cpp index 29c9c2d..5aef2ad 100755 --- a/core/jni/android_bluetooth_BluetoothAudioGateway.cpp +++ b/core/jni/android_bluetooth_BluetoothAudioGateway.cpp @@ -90,7 +90,7 @@ static int setup_listening_socket(int dev, int channel); #endif static void classInitNative(JNIEnv* env, jclass clazz) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH /* in */ @@ -123,7 +123,7 @@ static void classInitNative(JNIEnv* env, jclass clazz) { } static void initializeNativeDataNative(JNIEnv* env, jobject object) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = (native_data_t *)calloc(1, sizeof(native_data_t)); if (NULL == nat) { @@ -138,8 +138,8 @@ static void initializeNativeDataNative(JNIEnv* env, jobject object) { env->GetIntField(object, field_mHandsfreeAgRfcommChannel); nat->hs_ag_rfcomm_channel = env->GetIntField(object, field_mHeadsetAgRfcommChannel); - LOGV("HF RFCOMM channel = %d.", nat->hf_ag_rfcomm_channel); - LOGV("HS RFCOMM channel = %d.", nat->hs_ag_rfcomm_channel); + ALOGV("HF RFCOMM channel = %d.", nat->hf_ag_rfcomm_channel); + ALOGV("HS RFCOMM channel = %d.", nat->hs_ag_rfcomm_channel); /* Set the default values of these to -1. */ env->SetIntField(object, field_mConnectingHeadsetRfcommChannel, -1); @@ -151,7 +151,7 @@ static void initializeNativeDataNative(JNIEnv* env, jobject object) { } static void cleanupNativeDataNative(JNIEnv* env, jobject object) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = get_native_data(env, object); if (nat) { @@ -256,7 +256,7 @@ static inline int on_accept_set_fields(JNIEnv* env, jobject object, static jboolean waitForHandsfreeConnectNative(JNIEnv* env, jobject object, jint timeout_ms) { -// LOGV("%s", __FUNCTION__); +// ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH env->SetIntField(object, field_mTimeoutRemainingMs, timeout_ms); @@ -445,7 +445,7 @@ static jboolean waitForHandsfreeConnectNative(JNIEnv* env, jobject object, } static jboolean setUpListeningSocketsNative(JNIEnv* env, jobject object) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = get_native_data(env, object); @@ -511,7 +511,7 @@ static int setup_listening_socket(int dev, int channel) { private native void tearDownListeningSocketsNative(); */ static void tearDownListeningSocketsNative(JNIEnv *env, jobject object) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = get_native_data(env, object); diff --git a/core/jni/android_bluetooth_BluetoothSocket.cpp b/core/jni/android_bluetooth_BluetoothSocket.cpp index 488b5c2..32ceb2c 100644 --- a/core/jni/android_bluetooth_BluetoothSocket.cpp +++ b/core/jni/android_bluetooth_BluetoothSocket.cpp @@ -70,12 +70,12 @@ static struct asocket *get_socketData(JNIEnv *env, jobject obj) { static void initSocketFromFdNative(JNIEnv *env, jobject obj, jint fd) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); struct asocket *s = asocket_init(fd); if (!s) { - LOGV("asocket_init() failed, throwing"); + ALOGV("asocket_init() failed, throwing"); jniThrowIOException(env, errno); return; } @@ -89,7 +89,7 @@ static void initSocketFromFdNative(JNIEnv *env, jobject obj, jint fd) { static void initSocketNative(JNIEnv *env, jobject obj) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); int fd; int lm = 0; @@ -116,7 +116,7 @@ static void initSocketNative(JNIEnv *env, jobject obj) { } if (fd < 0) { - LOGV("socket() failed, throwing"); + ALOGV("socket() failed, throwing"); jniThrowIOException(env, errno); return; } @@ -140,7 +140,7 @@ static void initSocketNative(JNIEnv *env, jobject obj) { if (lm) { if (setsockopt(fd, SOL_RFCOMM, RFCOMM_LM, &lm, sizeof(lm))) { - LOGV("setsockopt(RFCOMM_LM) failed, throwing"); + ALOGV("setsockopt(RFCOMM_LM) failed, throwing"); jniThrowIOException(env, errno); return; } @@ -149,13 +149,13 @@ static void initSocketNative(JNIEnv *env, jobject obj) { if (type == TYPE_RFCOMM) { sndbuf = RFCOMM_SO_SNDBUF; if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &sndbuf, sizeof(sndbuf))) { - LOGV("setsockopt(SO_SNDBUF) failed, throwing"); + ALOGV("setsockopt(SO_SNDBUF) failed, throwing"); jniThrowIOException(env, errno); return; } } - LOGV("...fd %d created (%s, lm = %x)", fd, TYPE_AS_STR(type), lm); + ALOGV("...fd %d created (%s, lm = %x)", fd, TYPE_AS_STR(type), lm); initSocketFromFdNative(env, obj, fd); return; @@ -165,7 +165,7 @@ static void initSocketNative(JNIEnv *env, jobject obj) { static void connectNative(JNIEnv *env, jobject obj) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); int ret; jint type; @@ -232,7 +232,7 @@ static void connectNative(JNIEnv *env, jobject obj) { connect: ret = asocket_connect(s, addr, addr_sz, -1); - LOGV("...connect(%d, %s) = %d (errno %d)", + ALOGV("...connect(%d, %s) = %d (errno %d)", s->fd, TYPE_AS_STR(type), ret, errno); if (ret && errno == EALREADY && retry < 2) { @@ -265,7 +265,7 @@ connect: /* Returns errno instead of throwing, so java can check errno */ static int bindListenNative(JNIEnv *env, jobject obj) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); jint type; socklen_t addr_sz; @@ -313,16 +313,16 @@ static int bindListenNative(JNIEnv *env, jobject obj) { } if (bind(s->fd, addr, addr_sz)) { - LOGV("...bind(%d) gave errno %d", s->fd, errno); + ALOGV("...bind(%d) gave errno %d", s->fd, errno); return errno; } if (listen(s->fd, 1)) { - LOGV("...listen(%d) gave errno %d", s->fd, errno); + ALOGV("...listen(%d) gave errno %d", s->fd, errno); return errno; } - LOGV("...bindListenNative(%d) success", s->fd); + ALOGV("...bindListenNative(%d) success", s->fd); return 0; @@ -332,7 +332,7 @@ static int bindListenNative(JNIEnv *env, jobject obj) { static jobject acceptNative(JNIEnv *env, jobject obj, int timeout) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); int fd; jint type; @@ -380,7 +380,7 @@ static jobject acceptNative(JNIEnv *env, jobject obj, int timeout) { fd = asocket_accept(s, addr, &addr_sz, timeout); - LOGV("...accept(%d, %s) = %d (errno %d)", + ALOGV("...accept(%d, %s) = %d (errno %d)", s->fd, TYPE_AS_STR(type), fd, errno); if (fd < 0) { @@ -405,7 +405,7 @@ static jobject acceptNative(JNIEnv *env, jobject obj, int timeout) { static jint availableNative(JNIEnv *env, jobject obj) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); int available; struct asocket *s = get_socketData(env, obj); @@ -428,7 +428,7 @@ static jint availableNative(JNIEnv *env, jobject obj) { static jint readNative(JNIEnv *env, jobject obj, jbyteArray jb, jint offset, jint length) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); int ret; jbyte *b; @@ -471,7 +471,7 @@ static jint readNative(JNIEnv *env, jobject obj, jbyteArray jb, jint offset, static jint writeNative(JNIEnv *env, jobject obj, jbyteArray jb, jint offset, jint length) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); int ret, total; jbyte *b; @@ -519,7 +519,7 @@ static jint writeNative(JNIEnv *env, jobject obj, jbyteArray jb, jint offset, static void abortNative(JNIEnv *env, jobject obj) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); struct asocket *s = get_socketData(env, obj); if (!s) @@ -527,7 +527,7 @@ static void abortNative(JNIEnv *env, jobject obj) { asocket_abort(s); - LOGV("...asocket_abort(%d) complete", s->fd); + ALOGV("...asocket_abort(%d) complete", s->fd); return; #endif jniThrowIOException(env, ENOSYS); @@ -535,7 +535,7 @@ static void abortNative(JNIEnv *env, jobject obj) { static void destroyNative(JNIEnv *env, jobject obj) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); struct asocket *s = get_socketData(env, obj); int fd = s->fd; @@ -544,7 +544,7 @@ static void destroyNative(JNIEnv *env, jobject obj) { asocket_destroy(s); - LOGV("...asocket_destroy(%d) complete", fd); + ALOGV("...asocket_destroy(%d) complete", fd); return; #endif jniThrowIOException(env, ENOSYS); diff --git a/core/jni/android_bluetooth_HeadsetBase.cpp b/core/jni/android_bluetooth_HeadsetBase.cpp index 4de29de..71697a7 100644 --- a/core/jni/android_bluetooth_HeadsetBase.cpp +++ b/core/jni/android_bluetooth_HeadsetBase.cpp @@ -180,7 +180,7 @@ again: #endif static void classInitNative(JNIEnv* env, jclass clazz) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH field_mNativeData = get_field(env, clazz, "mNativeData", "I"); field_mAddress = get_field(env, clazz, "mAddress", "Ljava/lang/String;"); @@ -191,7 +191,7 @@ static void classInitNative(JNIEnv* env, jclass clazz) { static void initializeNativeDataNative(JNIEnv* env, jobject object, jint socketFd) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = (native_data_t *)calloc(1, sizeof(native_data_t)); if (NULL == nat) { @@ -213,7 +213,7 @@ static void initializeNativeDataNative(JNIEnv* env, jobject object, } static void cleanupNativeDataNative(JNIEnv* env, jobject object) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = (native_data_t *)env->GetIntField(object, field_mNativeData); @@ -226,7 +226,7 @@ static void cleanupNativeDataNative(JNIEnv* env, jobject object) { static jboolean connectNative(JNIEnv *env, jobject obj) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH int lm; struct sockaddr_rc addr; @@ -278,13 +278,13 @@ static jboolean connectNative(JNIEnv *env, jobject obj) } static jint connectAsyncNative(JNIEnv *env, jobject obj) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH struct sockaddr_rc addr; native_data_t *nat = get_native_data(env, obj); if (nat->rfcomm_connected) { - LOGV("RFCOMM socket is already connected or connection is in progress."); + ALOGV("RFCOMM socket is already connected or connection is in progress."); return 0; } @@ -357,7 +357,7 @@ static jint connectAsyncNative(JNIEnv *env, jobject obj) { static jint waitForAsyncConnectNative(JNIEnv *env, jobject obj, jint timeout_ms) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH struct sockaddr_rc addr; native_data_t *nat = get_native_data(env, obj); @@ -403,7 +403,7 @@ static jint waitForAsyncConnectNative(JNIEnv *env, jobject obj, if (timeout_ms > 0) { jint remaining = to.tv_sec*1000 + to.tv_usec/1000; - LOGV("Remaining time %ldms", (long)remaining); + ALOGV("Remaining time %ldms", (long)remaining); env->SetIntField(obj, field_mTimeoutRemainingMs, remaining); } @@ -419,7 +419,7 @@ static jint waitForAsyncConnectNative(JNIEnv *env, jobject obj, } /* n must be equal to 1 and either rset or wset must have the file descriptor set. */ - LOGV("select() returned %d.", n); + ALOGV("select() returned %d.", n); if (FD_ISSET(nat->rfcomm_sock, &rset) || FD_ISSET(nat->rfcomm_sock, &wset)) { @@ -463,7 +463,7 @@ static jint waitForAsyncConnectNative(JNIEnv *env, jobject obj, } static void disconnectNative(JNIEnv *env, jobject obj) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = get_native_data(env, obj); if (nat->rfcomm_sock >= 0) { @@ -494,7 +494,7 @@ static void pretty_log_urc(const char *urc) { } } } - IF_LOGV() ALOG(LOG_VERBOSE, "Bluetooth AT sent", "%s", buf); + IF_ALOGV() ALOG(LOG_VERBOSE, "Bluetooth AT sent", "%s", buf); free(buf); } diff --git a/core/jni/android_bluetooth_common.cpp b/core/jni/android_bluetooth_common.cpp index 5c6f5e8..a3e99cb 100644 --- a/core/jni/android_bluetooth_common.cpp +++ b/core/jni/android_bluetooth_common.cpp @@ -464,7 +464,7 @@ jobjectArray dbus_returns_array_of_strings(JNIEnv *env, DBusMessage *reply) { jclass stringClass; jstring classNameStr; - //LOGV("%s: there are %d elements in string array!", __FUNCTION__, len); + //ALOGV("%s: there are %d elements in string array!", __FUNCTION__, len); stringClass = env->FindClass("java/lang/String"); strArray = env->NewObjectArray(len, stringClass, NULL); @@ -490,7 +490,7 @@ jbyteArray dbus_returns_array_of_bytes(JNIEnv *env, DBusMessage *reply) { if (dbus_message_get_args(reply, &err, DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE, &list, &len, DBUS_TYPE_INVALID)) { - //LOGV("%s: there are %d elements in byte array!", __FUNCTION__, len); + //ALOGV("%s: there are %d elements in byte array!", __FUNCTION__, len); byteArray = env->NewByteArray(len); if (byteArray) env->SetByteArrayRegion(byteArray, 0, len, list); diff --git a/core/jni/android_database_SQLiteCompiledSql.cpp b/core/jni/android_database_SQLiteCompiledSql.cpp index de4c5c8..a916ef5 100644 --- a/core/jni/android_database_SQLiteCompiledSql.cpp +++ b/core/jni/android_database_SQLiteCompiledSql.cpp @@ -66,7 +66,7 @@ sqlite3_stmt * compile(JNIEnv* env, jobject object, if (err == SQLITE_OK) { // Store the statement in the Java object for future calls - LOGV("Prepared statement %p on %p", statement, handle); + ALOGV("Prepared statement %p on %p", statement, handle); env->SetIntField(object, gStatementField, (int)statement); return statement; } else { diff --git a/core/jni/android_database_SQLiteDatabase.cpp b/core/jni/android_database_SQLiteDatabase.cpp index e0c900e..605a11c 100644 --- a/core/jni/android_database_SQLiteDatabase.cpp +++ b/core/jni/android_database_SQLiteDatabase.cpp @@ -89,7 +89,7 @@ static void registerLoggingFunc(const char *path) { return; } - LOGV("Registering sqlite logging func \n"); + ALOGV("Registering sqlite logging func \n"); int err = sqlite3_config(SQLITE_CONFIG_LOG, &sqlLogger, (void *)createStr(path, 0)); if (err != SQLITE_OK) { LOGW("sqlite returned error = %d when trying to register logging func.\n", err); @@ -170,7 +170,7 @@ static void dbopen(JNIEnv* env, jobject object, jstring pathString, jint flags) goto done; } - LOGV("Opened '%s' - %p\n", path8, handle); + ALOGV("Opened '%s' - %p\n", path8, handle); env->SetIntField(object, offset_db_handle, (int) handle); handle = NULL; // The caller owns the handle now. @@ -236,10 +236,10 @@ static void dbclose(JNIEnv* env, jobject object) if (traceFuncArg != NULL) { free(traceFuncArg); } - LOGV("Closing database: handle=%p\n", handle); + ALOGV("Closing database: handle=%p\n", handle); int result = sqlite3_close(handle); if (result == SQLITE_OK) { - LOGV("Closed %p\n", handle); + ALOGV("Closed %p\n", handle); env->SetIntField(object, offset_db_handle, 0); } else { // This can happen if sub-objects aren't closed first. Make sure the caller knows. diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp index fe60381..25763ac 100644 --- a/core/jni/android_hardware_Camera.cpp +++ b/core/jni/android_hardware_Camera.cpp @@ -115,7 +115,7 @@ sp<Camera> get_native_camera(JNIEnv *env, jobject thiz, JNICameraContext** pCont if (context != NULL) { camera = context->getCamera(); } - LOGV("get_native_camera: context=%p, camera=%p", context, camera.get()); + ALOGV("get_native_camera: context=%p, camera=%p", context, camera.get()); if (camera == 0) { jniThrowRuntimeException(env, "Method called after release()"); } @@ -142,7 +142,7 @@ JNICameraContext::JNICameraContext(JNIEnv* env, jobject weak_this, jclass clazz, void JNICameraContext::release() { - LOGV("release"); + ALOGV("release"); Mutex::Autolock _l(mLock); JNIEnv *env = AndroidRuntime::getJNIEnv(); @@ -168,7 +168,7 @@ void JNICameraContext::release() void JNICameraContext::notify(int32_t msgType, int32_t ext1, int32_t ext2) { - LOGV("notify"); + ALOGV("notify"); // VM pointer will be NULL if object is released Mutex::Autolock _l(mLock); @@ -198,7 +198,7 @@ jbyteArray JNICameraContext::getCallbackBuffer( // Vector access should be protected by lock in postData() if (!buffers->isEmpty()) { - LOGV("Using callback buffer from queue of length %d", buffers->size()); + ALOGV("Using callback buffer from queue of length %d", buffers->size()); jbyteArray globalBuffer = buffers->itemAt(0); buffers->removeAt(0); @@ -228,7 +228,7 @@ void JNICameraContext::copyAndPost(JNIEnv* env, const sp<IMemory>& dataPtr, int ssize_t offset; size_t size; sp<IMemoryHeap> heap = dataPtr->getMemory(&offset, &size); - LOGV("copyAndPost: off=%ld, size=%d", offset, size); + ALOGV("copyAndPost: off=%ld, size=%d", offset, size); uint8_t *heapBase = (uint8_t*)heap->base(); if (heapBase != NULL) { @@ -240,7 +240,7 @@ void JNICameraContext::copyAndPost(JNIEnv* env, const sp<IMemory>& dataPtr, int obj = getCallbackBuffer(env, &mCallbackBuffers, size); if (mCallbackBuffers.isEmpty()) { - LOGV("Out of buffers, clearing callback!"); + ALOGV("Out of buffers, clearing callback!"); mCamera->setPreviewCallbackFlags(CAMERA_FRAME_CALLBACK_FLAG_NOOP); mManualCameraCallbackSet = false; @@ -249,7 +249,7 @@ void JNICameraContext::copyAndPost(JNIEnv* env, const sp<IMemory>& dataPtr, int } } } else { - LOGV("Allocating callback buffer"); + ALOGV("Allocating callback buffer"); obj = env->NewByteArray(size); } @@ -294,7 +294,7 @@ void JNICameraContext::postData(int32_t msgType, const sp<IMemory>& dataPtr, // For backward-compatibility purpose, if there is no callback // buffer for raw image, the callback returns null. case CAMERA_MSG_RAW_IMAGE: - LOGV("rawCallback"); + ALOGV("rawCallback"); if (mRawImageCallbackBuffers.isEmpty()) { env->CallStaticVoidMethod(mCameraJClass, fields.post_event, mCameraJObjectWeak, dataMsgType, 0, 0, NULL); @@ -308,7 +308,7 @@ void JNICameraContext::postData(int32_t msgType, const sp<IMemory>& dataPtr, break; default: - LOGV("dataCallback(%d, %p)", dataMsgType, dataPtr.get()); + ALOGV("dataCallback(%d, %p)", dataMsgType, dataPtr.get()); copyAndPost(env, dataPtr, dataMsgType); break; } @@ -386,7 +386,7 @@ void JNICameraContext::setCallbackMode(JNIEnv *env, bool installed, bool manualM void JNICameraContext::addCallbackBuffer( JNIEnv *env, jbyteArray cbb, int msgType) { - LOGV("addCallbackBuffer: 0x%x", msgType); + ALOGV("addCallbackBuffer: 0x%x", msgType); if (cbb != NULL) { Mutex::Autolock _l(mLock); switch (msgType) { @@ -394,7 +394,7 @@ void JNICameraContext::addCallbackBuffer( jbyteArray callbackBuffer = (jbyteArray)env->NewGlobalRef(cbb); mCallbackBuffers.push(callbackBuffer); - LOGV("Adding callback buffer to queue, %d total", + ALOGV("Adding callback buffer to queue, %d total", mCallbackBuffers.size()); // We want to make sure the camera knows we're ready for the @@ -430,7 +430,7 @@ void JNICameraContext::clearCallbackBuffers_l(JNIEnv *env) } void JNICameraContext::clearCallbackBuffers_l(JNIEnv *env, Vector<jbyteArray> *buffers) { - LOGV("Clearing callback buffers, %d remained", buffers->size()); + ALOGV("Clearing callback buffers, %d remained", buffers->size()); while (!buffers->isEmpty()) { env->DeleteGlobalRef(buffers->top()); buffers->pop(); @@ -494,8 +494,8 @@ static void android_hardware_Camera_native_setup(JNIEnv *env, jobject thiz, // finalizer is invoked later. static void android_hardware_Camera_release(JNIEnv *env, jobject thiz) { - // TODO: Change to LOGV - LOGV("release camera"); + // TODO: Change to ALOGV + ALOGV("release camera"); JNICameraContext* context = NULL; sp<Camera> camera; { @@ -510,7 +510,7 @@ static void android_hardware_Camera_release(JNIEnv *env, jobject thiz) if (context != NULL) { camera = context->getCamera(); context->release(); - LOGV("native_release: context=%p camera=%p", context, camera.get()); + ALOGV("native_release: context=%p camera=%p", context, camera.get()); // clear callbacks if (camera != NULL) { @@ -525,7 +525,7 @@ static void android_hardware_Camera_release(JNIEnv *env, jobject thiz) static void android_hardware_Camera_setPreviewDisplay(JNIEnv *env, jobject thiz, jobject jSurface) { - LOGV("setPreviewDisplay"); + ALOGV("setPreviewDisplay"); sp<Camera> camera = get_native_camera(env, thiz, NULL); if (camera == 0) return; @@ -541,7 +541,7 @@ static void android_hardware_Camera_setPreviewDisplay(JNIEnv *env, jobject thiz, static void android_hardware_Camera_setPreviewTexture(JNIEnv *env, jobject thiz, jobject jSurfaceTexture) { - LOGV("setPreviewTexture"); + ALOGV("setPreviewTexture"); sp<Camera> camera = get_native_camera(env, thiz, NULL); if (camera == 0) return; @@ -558,7 +558,7 @@ static void android_hardware_Camera_setPreviewTexture(JNIEnv *env, static void android_hardware_Camera_startPreview(JNIEnv *env, jobject thiz) { - LOGV("startPreview"); + ALOGV("startPreview"); sp<Camera> camera = get_native_camera(env, thiz, NULL); if (camera == 0) return; @@ -570,7 +570,7 @@ static void android_hardware_Camera_startPreview(JNIEnv *env, jobject thiz) static void android_hardware_Camera_stopPreview(JNIEnv *env, jobject thiz) { - LOGV("stopPreview"); + ALOGV("stopPreview"); sp<Camera> c = get_native_camera(env, thiz, NULL); if (c == 0) return; @@ -579,7 +579,7 @@ static void android_hardware_Camera_stopPreview(JNIEnv *env, jobject thiz) static bool android_hardware_Camera_previewEnabled(JNIEnv *env, jobject thiz) { - LOGV("previewEnabled"); + ALOGV("previewEnabled"); sp<Camera> c = get_native_camera(env, thiz, NULL); if (c == 0) return false; @@ -588,7 +588,7 @@ static bool android_hardware_Camera_previewEnabled(JNIEnv *env, jobject thiz) static void android_hardware_Camera_setHasPreviewCallback(JNIEnv *env, jobject thiz, jboolean installed, jboolean manualBuffer) { - LOGV("setHasPreviewCallback: installed:%d, manualBuffer:%d", (int)installed, (int)manualBuffer); + ALOGV("setHasPreviewCallback: installed:%d, manualBuffer:%d", (int)installed, (int)manualBuffer); // Important: Only install preview_callback if the Java code has called // setPreviewCallback() with a non-null value, otherwise we'd pay to memcpy // each preview frame for nothing. @@ -602,7 +602,7 @@ static void android_hardware_Camera_setHasPreviewCallback(JNIEnv *env, jobject t } static void android_hardware_Camera_addCallbackBuffer(JNIEnv *env, jobject thiz, jbyteArray bytes, int msgType) { - LOGV("addCallbackBuffer: 0x%x", msgType); + ALOGV("addCallbackBuffer: 0x%x", msgType); JNICameraContext* context = reinterpret_cast<JNICameraContext*>(env->GetIntField(thiz, fields.context)); @@ -613,7 +613,7 @@ static void android_hardware_Camera_addCallbackBuffer(JNIEnv *env, jobject thiz, static void android_hardware_Camera_autoFocus(JNIEnv *env, jobject thiz) { - LOGV("autoFocus"); + ALOGV("autoFocus"); JNICameraContext* context; sp<Camera> c = get_native_camera(env, thiz, &context); if (c == 0) return; @@ -625,7 +625,7 @@ static void android_hardware_Camera_autoFocus(JNIEnv *env, jobject thiz) static void android_hardware_Camera_cancelAutoFocus(JNIEnv *env, jobject thiz) { - LOGV("cancelAutoFocus"); + ALOGV("cancelAutoFocus"); JNICameraContext* context; sp<Camera> c = get_native_camera(env, thiz, &context); if (c == 0) return; @@ -637,7 +637,7 @@ static void android_hardware_Camera_cancelAutoFocus(JNIEnv *env, jobject thiz) static void android_hardware_Camera_takePicture(JNIEnv *env, jobject thiz, int msgType) { - LOGV("takePicture"); + ALOGV("takePicture"); JNICameraContext* context; sp<Camera> camera = get_native_camera(env, thiz, &context); if (camera == 0) return; @@ -652,9 +652,9 @@ static void android_hardware_Camera_takePicture(JNIEnv *env, jobject thiz, int m * Java application. */ if (msgType & CAMERA_MSG_RAW_IMAGE) { - LOGV("Enable raw image callback buffer"); + ALOGV("Enable raw image callback buffer"); if (!context->isRawImageCallbackBufferAvailable()) { - LOGV("Enable raw image notification, since no callback buffer exists"); + ALOGV("Enable raw image notification, since no callback buffer exists"); msgType &= ~CAMERA_MSG_RAW_IMAGE; msgType |= CAMERA_MSG_RAW_IMAGE_NOTIFY; } @@ -668,7 +668,7 @@ static void android_hardware_Camera_takePicture(JNIEnv *env, jobject thiz, int m static void android_hardware_Camera_setParameters(JNIEnv *env, jobject thiz, jstring params) { - LOGV("setParameters"); + ALOGV("setParameters"); sp<Camera> camera = get_native_camera(env, thiz, NULL); if (camera == 0) return; @@ -686,7 +686,7 @@ static void android_hardware_Camera_setParameters(JNIEnv *env, jobject thiz, jst static jstring android_hardware_Camera_getParameters(JNIEnv *env, jobject thiz) { - LOGV("getParameters"); + ALOGV("getParameters"); sp<Camera> camera = get_native_camera(env, thiz, NULL); if (camera == 0) return 0; @@ -695,7 +695,7 @@ static jstring android_hardware_Camera_getParameters(JNIEnv *env, jobject thiz) static void android_hardware_Camera_reconnect(JNIEnv *env, jobject thiz) { - LOGV("reconnect"); + ALOGV("reconnect"); sp<Camera> camera = get_native_camera(env, thiz, NULL); if (camera == 0) return; @@ -707,7 +707,7 @@ static void android_hardware_Camera_reconnect(JNIEnv *env, jobject thiz) static void android_hardware_Camera_lock(JNIEnv *env, jobject thiz) { - LOGV("lock"); + ALOGV("lock"); sp<Camera> camera = get_native_camera(env, thiz, NULL); if (camera == 0) return; @@ -718,7 +718,7 @@ static void android_hardware_Camera_lock(JNIEnv *env, jobject thiz) static void android_hardware_Camera_unlock(JNIEnv *env, jobject thiz) { - LOGV("unlock"); + ALOGV("unlock"); sp<Camera> camera = get_native_camera(env, thiz, NULL); if (camera == 0) return; @@ -729,7 +729,7 @@ static void android_hardware_Camera_unlock(JNIEnv *env, jobject thiz) static void android_hardware_Camera_startSmoothZoom(JNIEnv *env, jobject thiz, jint value) { - LOGV("startSmoothZoom"); + ALOGV("startSmoothZoom"); sp<Camera> camera = get_native_camera(env, thiz, NULL); if (camera == 0) return; @@ -745,7 +745,7 @@ static void android_hardware_Camera_startSmoothZoom(JNIEnv *env, jobject thiz, j static void android_hardware_Camera_stopSmoothZoom(JNIEnv *env, jobject thiz) { - LOGV("stopSmoothZoom"); + ALOGV("stopSmoothZoom"); sp<Camera> camera = get_native_camera(env, thiz, NULL); if (camera == 0) return; @@ -757,7 +757,7 @@ static void android_hardware_Camera_stopSmoothZoom(JNIEnv *env, jobject thiz) static void android_hardware_Camera_setDisplayOrientation(JNIEnv *env, jobject thiz, jint value) { - LOGV("setDisplayOrientation"); + ALOGV("setDisplayOrientation"); sp<Camera> camera = get_native_camera(env, thiz, NULL); if (camera == 0) return; @@ -769,7 +769,7 @@ static void android_hardware_Camera_setDisplayOrientation(JNIEnv *env, jobject t static void android_hardware_Camera_startFaceDetection(JNIEnv *env, jobject thiz, jint type) { - LOGV("startFaceDetection"); + ALOGV("startFaceDetection"); JNICameraContext* context; sp<Camera> camera = get_native_camera(env, thiz, &context); if (camera == 0) return; @@ -786,7 +786,7 @@ static void android_hardware_Camera_startFaceDetection(JNIEnv *env, jobject thiz static void android_hardware_Camera_stopFaceDetection(JNIEnv *env, jobject thiz) { - LOGV("stopFaceDetection"); + ALOGV("stopFaceDetection"); sp<Camera> camera = get_native_camera(env, thiz, NULL); if (camera == 0) return; diff --git a/core/jni/android_media_AudioRecord.cpp b/core/jni/android_media_AudioRecord.cpp index 9be3779..ca13c18 100644 --- a/core/jni/android_media_AudioRecord.cpp +++ b/core/jni/android_media_AudioRecord.cpp @@ -129,8 +129,8 @@ android_media_AudioRecord_setup(JNIEnv *env, jobject thiz, jobject weak_this, jint source, jint sampleRateInHertz, jint channels, jint audioFormat, jint buffSizeInBytes, jintArray jSession) { - //LOGV(">> Entering android_media_AudioRecord_setup"); - //LOGV("sampleRate=%d, audioFormat=%d, channels=%x, buffSizeInBytes=%d", + //ALOGV(">> Entering android_media_AudioRecord_setup"); + //ALOGV("sampleRate=%d, audioFormat=%d, channels=%x, buffSizeInBytes=%d", // sampleRateInHertz, audioFormat, channels, buffSizeInBytes); if (!audio_is_input_channel(channels)) { @@ -279,7 +279,7 @@ android_media_AudioRecord_stop(JNIEnv *env, jobject thiz) } lpRecorder->stop(); - //LOGV("Called lpRecorder->stop()"); + //ALOGV("Called lpRecorder->stop()"); } @@ -300,14 +300,14 @@ static void android_media_AudioRecord_release(JNIEnv *env, jobject thiz) { // delete the AudioRecord object if (lpRecorder) { - LOGV("About to delete lpRecorder: %x\n", (int)lpRecorder); + ALOGV("About to delete lpRecorder: %x\n", (int)lpRecorder); lpRecorder->stop(); delete lpRecorder; } // delete the callback information if (lpCookie) { - LOGV("deleting lpCookie: %x\n", (int)lpCookie); + ALOGV("deleting lpCookie: %x\n", (int)lpCookie); env->DeleteGlobalRef(lpCookie->audioRecord_class); env->DeleteGlobalRef(lpCookie->audioRecord_ref); delete lpCookie; @@ -378,7 +378,7 @@ static jint android_media_AudioRecord_readInShortArray(JNIEnv *env, jobject thi static jint android_media_AudioRecord_readInDirectBuffer(JNIEnv *env, jobject thiz, jobject jBuffer, jint sizeInBytes) { AudioRecord *lpRecorder = NULL; - //LOGV("Entering android_media_AudioRecord_readInBuffer"); + //ALOGV("Entering android_media_AudioRecord_readInBuffer"); // get the audio recorder from which we'll read new audio samples lpRecorder = @@ -393,7 +393,7 @@ static jint android_media_AudioRecord_readInDirectBuffer(JNIEnv *env, jobject t LOGE("Buffer direct access is not supported, can't record"); return 0; } - //LOGV("capacity = %ld", capacity); + //ALOGV("capacity = %ld", capacity); jbyte* nativeFromJavaBuf = (jbyte*) env->GetDirectBufferAddress(jBuffer); if(nativeFromJavaBuf==NULL) { LOGE("Buffer direct access is not supported, can't record"); @@ -485,7 +485,7 @@ static jint android_media_AudioRecord_get_pos_update_period(JNIEnv *env, jobjec static jint android_media_AudioRecord_get_min_buff_size(JNIEnv *env, jobject thiz, jint sampleRateInHertz, jint nbChannels, jint audioFormat) { - LOGV(">> android_media_AudioRecord_get_min_buff_size(%d, %d, %d)", sampleRateInHertz, nbChannels, audioFormat); + ALOGV(">> android_media_AudioRecord_get_min_buff_size(%d, %d, %d)", sampleRateInHertz, nbChannels, audioFormat); int frameCount = 0; status_t result = AudioRecord::getMinFrameCount(&frameCount, diff --git a/core/jni/android_media_AudioTrack.cpp b/core/jni/android_media_AudioTrack.cpp index 2929056..84e7432 100644 --- a/core/jni/android_media_AudioTrack.cpp +++ b/core/jni/android_media_AudioTrack.cpp @@ -170,7 +170,7 @@ android_media_AudioTrack_native_setup(JNIEnv *env, jobject thiz, jobject weak_th jint streamType, jint sampleRateInHertz, jint javaChannelMask, jint audioFormat, jint buffSizeInBytes, jint memoryMode, jintArray jSession) { - LOGV("sampleRate=%d, audioFormat(from Java)=%d, channel mask=%x, buffSize=%d", + ALOGV("sampleRate=%d, audioFormat(from Java)=%d, channel mask=%x, buffSize=%d", sampleRateInHertz, audioFormat, javaChannelMask, buffSizeInBytes); int afSampleRate; int afFrameCount; @@ -230,7 +230,7 @@ android_media_AudioTrack_native_setup(JNIEnv *env, jobject thiz, jobject weak_th // in android_media_AudioTrack_native_write() if ((audioFormat == javaAudioTrackFields.PCM8) && (memoryMode == javaAudioTrackFields.MODE_STATIC)) { - LOGV("android_media_AudioTrack_native_setup(): requesting MODE_STATIC for 8bit \ + ALOGV("android_media_AudioTrack_native_setup(): requesting MODE_STATIC for 8bit \ buff size of %dbytes, switching to 16bit, buff size of %dbytes", buffSizeInBytes, 2*buffSizeInBytes); audioFormat = javaAudioTrackFields.PCM16; @@ -341,7 +341,7 @@ android_media_AudioTrack_native_setup(JNIEnv *env, jobject thiz, jobject weak_th env->SetIntField(thiz, javaAudioTrackFields.nativeTrackInJavaObj, (int)lpTrack); // save the JNI resources so we can free them later - //LOGV("storing lpJniStorage: %x\n", (int)lpJniStorage); + //ALOGV("storing lpJniStorage: %x\n", (int)lpJniStorage); env->SetIntField(thiz, javaAudioTrackFields.jniData, (int)lpJniStorage); return AUDIOTRACK_SUCCESS; @@ -444,13 +444,13 @@ android_media_AudioTrack_set_volume(JNIEnv *env, jobject thiz, jfloat leftVol, j // ---------------------------------------------------------------------------- static void android_media_AudioTrack_native_finalize(JNIEnv *env, jobject thiz) { - //LOGV("android_media_AudioTrack_native_finalize jobject: %x\n", (int)thiz); + //ALOGV("android_media_AudioTrack_native_finalize jobject: %x\n", (int)thiz); // delete the AudioTrack object AudioTrack *lpTrack = (AudioTrack *)env->GetIntField( thiz, javaAudioTrackFields.nativeTrackInJavaObj); if (lpTrack) { - //LOGV("deleting lpTrack: %x\n", (int)lpTrack); + //ALOGV("deleting lpTrack: %x\n", (int)lpTrack); lpTrack->stop(); delete lpTrack; } @@ -462,7 +462,7 @@ static void android_media_AudioTrack_native_finalize(JNIEnv *env, jobject thiz) // delete global refs created in native_setup env->DeleteGlobalRef(pJniStorage->mCallbackData.audioTrack_class); env->DeleteGlobalRef(pJniStorage->mCallbackData.audioTrack_ref); - //LOGV("deleting pJniStorage: %x\n", (int)pJniStorage); + //ALOGV("deleting pJniStorage: %x\n", (int)pJniStorage); delete pJniStorage; } } @@ -525,7 +525,7 @@ static jint android_media_AudioTrack_native_write(JNIEnv *env, jobject thiz, jint javaAudioFormat) { jbyte* cAudioData = NULL; AudioTrack *lpTrack = NULL; - //LOGV("android_media_AudioTrack_native_write(offset=%d, sizeInBytes=%d) called", + //ALOGV("android_media_AudioTrack_native_write(offset=%d, sizeInBytes=%d) called", // offsetInBytes, sizeInBytes); // get the audio track to load with samples @@ -556,7 +556,7 @@ static jint android_media_AudioTrack_native_write(JNIEnv *env, jobject thiz, env->ReleaseByteArrayElements(javaAudioData, cAudioData, 0); - //LOGV("write wrote %d (tried %d) bytes in the native AudioTrack with offset %d", + //ALOGV("write wrote %d (tried %d) bytes in the native AudioTrack with offset %d", // (int)written, (int)(sizeInBytes), (int)offsetInBytes); return written; } diff --git a/core/jni/android_media_JetPlayer.cpp b/core/jni/android_media_JetPlayer.cpp index e124069..66421a9 100644 --- a/core/jni/android_media_JetPlayer.cpp +++ b/core/jni/android_media_JetPlayer.cpp @@ -79,7 +79,7 @@ static jboolean android_media_JetPlayer_setup(JNIEnv *env, jobject thiz, jobject weak_this, jint maxTracks, jint trackBufferSize) { - //LOGV("android_media_JetPlayer_setup(): entering."); + //ALOGV("android_media_JetPlayer_setup(): entering."); JetPlayer* lpJet = new JetPlayer(env->NewGlobalRef(weak_this), maxTracks, trackBufferSize); EAS_RESULT result = lpJet->init(); @@ -102,7 +102,7 @@ android_media_JetPlayer_setup(JNIEnv *env, jobject thiz, jobject weak_this, static void android_media_JetPlayer_finalize(JNIEnv *env, jobject thiz) { - LOGV("android_media_JetPlayer_finalize(): entering."); + ALOGV("android_media_JetPlayer_finalize(): entering."); JetPlayer *lpJet = (JetPlayer *)env->GetIntField( thiz, javaJetPlayerFields.nativePlayerInJavaObj); if(lpJet != NULL) { @@ -110,7 +110,7 @@ android_media_JetPlayer_finalize(JNIEnv *env, jobject thiz) delete lpJet; } - LOGV("android_media_JetPlayer_finalize(): exiting."); + ALOGV("android_media_JetPlayer_finalize(): exiting."); } @@ -120,7 +120,7 @@ android_media_JetPlayer_release(JNIEnv *env, jobject thiz) { android_media_JetPlayer_finalize(env, thiz); env->SetIntField(thiz, javaJetPlayerFields.nativePlayerInJavaObj, 0); - LOGV("android_media_JetPlayer_release() done"); + ALOGV("android_media_JetPlayer_release() done"); } @@ -144,12 +144,12 @@ android_media_JetPlayer_loadFromFile(JNIEnv *env, jobject thiz, jstring path) return JNI_FALSE; } - LOGV("android_media_JetPlayer_openFile(): trying to open %s", pathStr ); + ALOGV("android_media_JetPlayer_openFile(): trying to open %s", pathStr ); EAS_RESULT result = lpJet->loadFromFile(pathStr); env->ReleaseStringUTFChars(path, pathStr); if(result==EAS_SUCCESS) { - //LOGV("android_media_JetPlayer_openFile(): file successfully opened"); + //ALOGV("android_media_JetPlayer_openFile(): file successfully opened"); return JNI_TRUE; } else { LOGE("android_media_JetPlayer_openFile(): failed to open file with EAS error %d", @@ -174,12 +174,12 @@ android_media_JetPlayer_loadFromFileD(JNIEnv *env, jobject thiz, // set up event callback function lpJet->setEventCallback(jetPlayerEventCallback); - LOGV("android_media_JetPlayer_openFileDescr(): trying to load JET file through its fd" ); + ALOGV("android_media_JetPlayer_openFileDescr(): trying to load JET file through its fd" ); EAS_RESULT result = lpJet->loadFromFD(jniGetFDFromFileDescriptor(env, fileDescriptor), (long long)offset, (long long)length); // cast params to types used by EAS_FILE if(result==EAS_SUCCESS) { - LOGV("android_media_JetPlayer_openFileDescr(): file successfully opened"); + ALOGV("android_media_JetPlayer_openFileDescr(): file successfully opened"); return JNI_TRUE; } else { LOGE("android_media_JetPlayer_openFileDescr(): failed to open file with EAS error %d", @@ -201,7 +201,7 @@ android_media_JetPlayer_closeFile(JNIEnv *env, jobject thiz) } if( lpJet->closeFile()==EAS_SUCCESS) { - //LOGV("android_media_JetPlayer_closeFile(): file successfully closed"); + //ALOGV("android_media_JetPlayer_closeFile(): file successfully closed"); return JNI_TRUE; } else { LOGE("android_media_JetPlayer_closeFile(): failed to close file"); @@ -223,7 +223,7 @@ android_media_JetPlayer_play(JNIEnv *env, jobject thiz) EAS_RESULT result = lpJet->play(); if( result==EAS_SUCCESS) { - //LOGV("android_media_JetPlayer_play(): play successful"); + //ALOGV("android_media_JetPlayer_play(): play successful"); return JNI_TRUE; } else { LOGE("android_media_JetPlayer_play(): failed to play with EAS error code %ld", @@ -246,11 +246,11 @@ android_media_JetPlayer_pause(JNIEnv *env, jobject thiz) EAS_RESULT result = lpJet->pause(); if( result==EAS_SUCCESS) { - //LOGV("android_media_JetPlayer_pause(): pause successful"); + //ALOGV("android_media_JetPlayer_pause(): pause successful"); return JNI_TRUE; } else { if(result==EAS_ERROR_QUEUE_IS_EMPTY) { - LOGV("android_media_JetPlayer_pause(): paused with an empty queue"); + ALOGV("android_media_JetPlayer_pause(): paused with an empty queue"); return JNI_TRUE; } else LOGE("android_media_JetPlayer_pause(): failed to pause with EAS error code %ld", @@ -276,7 +276,7 @@ android_media_JetPlayer_queueSegment(JNIEnv *env, jobject thiz, EAS_RESULT result = lpJet->queueSegment(segmentNum, libNum, repeatCount, transpose, muteFlags, userID); if(result==EAS_SUCCESS) { - //LOGV("android_media_JetPlayer_queueSegment(): segment successfully queued"); + //ALOGV("android_media_JetPlayer_queueSegment(): segment successfully queued"); return JNI_TRUE; } else { LOGE("android_media_JetPlayer_queueSegment(): failed with EAS error code %ld", @@ -316,13 +316,13 @@ android_media_JetPlayer_queueSegmentMuteArray(JNIEnv *env, jobject thiz, else muteMask = muteMask << 1; } - //LOGV("android_media_JetPlayer_queueSegmentMuteArray(): FINAL mute mask =0x%08lX", mask); + //ALOGV("android_media_JetPlayer_queueSegmentMuteArray(): FINAL mute mask =0x%08lX", mask); result = lpJet->queueSegment(segmentNum, libNum, repeatCount, transpose, muteMask, userID); env->ReleaseBooleanArrayElements(muteArray, muteTracks, 0); if(result==EAS_SUCCESS) { - //LOGV("android_media_JetPlayer_queueSegmentMuteArray(): segment successfully queued"); + //ALOGV("android_media_JetPlayer_queueSegmentMuteArray(): segment successfully queued"); return JNI_TRUE; } else { LOGE("android_media_JetPlayer_queueSegmentMuteArray(): failed with EAS error code %ld", @@ -347,7 +347,7 @@ android_media_JetPlayer_setMuteFlags(JNIEnv *env, jobject thiz, EAS_RESULT result; result = lpJet->setMuteFlags(muteFlags, bSync==JNI_TRUE ? true : false); if(result==EAS_SUCCESS) { - //LOGV("android_media_JetPlayer_setMuteFlags(): mute flags successfully updated"); + //ALOGV("android_media_JetPlayer_setMuteFlags(): mute flags successfully updated"); return JNI_TRUE; } else { LOGE("android_media_JetPlayer_setMuteFlags(): failed with EAS error code %ld", result); @@ -385,13 +385,13 @@ android_media_JetPlayer_setMuteArray(JNIEnv *env, jobject thiz, else muteMask = muteMask << 1; } - //LOGV("android_media_JetPlayer_setMuteArray(): FINAL mute mask =0x%08lX", muteMask); + //ALOGV("android_media_JetPlayer_setMuteArray(): FINAL mute mask =0x%08lX", muteMask); result = lpJet->setMuteFlags(muteMask, bSync==JNI_TRUE ? true : false); env->ReleaseBooleanArrayElements(muteArray, muteTracks, 0); if(result==EAS_SUCCESS) { - //LOGV("android_media_JetPlayer_setMuteArray(): mute flags successfully updated"); + //ALOGV("android_media_JetPlayer_setMuteArray(): mute flags successfully updated"); return JNI_TRUE; } else { LOGE("android_media_JetPlayer_setMuteArray(): \ @@ -417,7 +417,7 @@ android_media_JetPlayer_setMuteFlag(JNIEnv *env, jobject thiz, result = lpJet->setMuteFlag(trackId, muteFlag==JNI_TRUE ? true : false, bSync==JNI_TRUE ? true : false); if(result==EAS_SUCCESS) { - //LOGV("android_media_JetPlayer_setMuteFlag(): mute flag successfully updated for track %d", trackId); + //ALOGV("android_media_JetPlayer_setMuteFlag(): mute flag successfully updated for track %d", trackId); return JNI_TRUE; } else { LOGE("android_media_JetPlayer_setMuteFlag(): failed to update mute flag for track %d with EAS error code %ld", @@ -441,7 +441,7 @@ android_media_JetPlayer_triggerClip(JNIEnv *env, jobject thiz, jint clipId) EAS_RESULT result; result = lpJet->triggerClip(clipId); if(result==EAS_SUCCESS) { - //LOGV("android_media_JetPlayer_triggerClip(): triggerClip successful for clip %d", clipId); + //ALOGV("android_media_JetPlayer_triggerClip(): triggerClip successful for clip %d", clipId); return JNI_TRUE; } else { LOGE("android_media_JetPlayer_triggerClip(): triggerClip for clip %d failed with EAS error code %ld", @@ -464,7 +464,7 @@ android_media_JetPlayer_clearQueue(JNIEnv *env, jobject thiz) EAS_RESULT result = lpJet->clearQueue(); if(result==EAS_SUCCESS) { - //LOGV("android_media_JetPlayer_clearQueue(): clearQueue successful"); + //ALOGV("android_media_JetPlayer_clearQueue(): clearQueue successful"); return JNI_TRUE; } else { LOGE("android_media_JetPlayer_clearQueue(): clearQueue failed with EAS error code %ld", diff --git a/core/jni/android_media_ToneGenerator.cpp b/core/jni/android_media_ToneGenerator.cpp index fdd586b..965afae 100644 --- a/core/jni/android_media_ToneGenerator.cpp +++ b/core/jni/android_media_ToneGenerator.cpp @@ -39,7 +39,7 @@ struct fields_t { static fields_t fields; static jboolean android_media_ToneGenerator_startTone(JNIEnv *env, jobject thiz, jint toneType, jint durationMs) { - LOGV("android_media_ToneGenerator_startTone: %x\n", (int)thiz); + ALOGV("android_media_ToneGenerator_startTone: %x\n", (int)thiz); ToneGenerator *lpToneGen = (ToneGenerator *)env->GetIntField(thiz, fields.context); @@ -52,12 +52,12 @@ static jboolean android_media_ToneGenerator_startTone(JNIEnv *env, jobject thiz, } static void android_media_ToneGenerator_stopTone(JNIEnv *env, jobject thiz) { - LOGV("android_media_ToneGenerator_stopTone: %x\n", (int)thiz); + ALOGV("android_media_ToneGenerator_stopTone: %x\n", (int)thiz); ToneGenerator *lpToneGen = (ToneGenerator *)env->GetIntField(thiz, fields.context); - LOGV("ToneGenerator lpToneGen: %x\n", (unsigned int)lpToneGen); + ALOGV("ToneGenerator lpToneGen: %x\n", (unsigned int)lpToneGen); if (lpToneGen == NULL) { jniThrowRuntimeException(env, "Method called after release()"); return; @@ -68,7 +68,7 @@ static void android_media_ToneGenerator_stopTone(JNIEnv *env, jobject thiz) { static void android_media_ToneGenerator_release(JNIEnv *env, jobject thiz) { ToneGenerator *lpToneGen = (ToneGenerator *)env->GetIntField(thiz, fields.context); - LOGV("android_media_ToneGenerator_release lpToneGen: %x\n", (int)lpToneGen); + ALOGV("android_media_ToneGenerator_release lpToneGen: %x\n", (int)lpToneGen); env->SetIntField(thiz, fields.context, 0); @@ -83,14 +83,14 @@ static void android_media_ToneGenerator_native_setup(JNIEnv *env, jobject thiz, env->SetIntField(thiz, fields.context, 0); - LOGV("android_media_ToneGenerator_native_setup jobject: %x\n", (int)thiz); + ALOGV("android_media_ToneGenerator_native_setup jobject: %x\n", (int)thiz); if (lpToneGen == NULL) { LOGE("ToneGenerator creation failed \n"); jniThrowException(env, "java/lang/OutOfMemoryError", NULL); return; } - LOGV("ToneGenerator lpToneGen: %x\n", (unsigned int)lpToneGen); + ALOGV("ToneGenerator lpToneGen: %x\n", (unsigned int)lpToneGen); if (!lpToneGen->isInited()) { LOGE("ToneGenerator init failed \n"); @@ -101,18 +101,18 @@ static void android_media_ToneGenerator_native_setup(JNIEnv *env, jobject thiz, // Stow our new C++ ToneGenerator in an opaque field in the Java object. env->SetIntField(thiz, fields.context, (int)lpToneGen); - LOGV("ToneGenerator fields.context: %x\n", env->GetIntField(thiz, fields.context)); + ALOGV("ToneGenerator fields.context: %x\n", env->GetIntField(thiz, fields.context)); } static void android_media_ToneGenerator_native_finalize(JNIEnv *env, jobject thiz) { - LOGV("android_media_ToneGenerator_native_finalize jobject: %x\n", (int)thiz); + ALOGV("android_media_ToneGenerator_native_finalize jobject: %x\n", (int)thiz); ToneGenerator *lpToneGen = (ToneGenerator *)env->GetIntField(thiz, fields.context); if (lpToneGen) { - LOGV("delete lpToneGen: %x\n", (int)lpToneGen); + ALOGV("delete lpToneGen: %x\n", (int)lpToneGen); delete lpToneGen; } } @@ -142,7 +142,7 @@ int register_android_media_ToneGenerator(JNIEnv *env) { LOGE("Can't find ToneGenerator.mNativeContext"); return -1; } - LOGV("register_android_media_ToneGenerator ToneGenerator fields.context: %x", (unsigned int)fields.context); + ALOGV("register_android_media_ToneGenerator ToneGenerator fields.context: %x", (unsigned int)fields.context); return AndroidRuntime::registerNativeMethods(env, "android/media/ToneGenerator", gMethods, NELEM(gMethods)); diff --git a/core/jni/android_server_BluetoothA2dpService.cpp b/core/jni/android_server_BluetoothA2dpService.cpp index 1851ad6..2bab4b5 100644 --- a/core/jni/android_server_BluetoothA2dpService.cpp +++ b/core/jni/android_server_BluetoothA2dpService.cpp @@ -61,7 +61,7 @@ static Properties sink_properties[] = { * Return false if dbus is down, or another serious error (out of memory) */ static bool initNative(JNIEnv* env, jobject object) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH nat = (native_data_t *)calloc(1, sizeof(native_data_t)); if (NULL == nat) { @@ -88,7 +88,7 @@ static bool initNative(JNIEnv* env, jobject object) { static void cleanupNative(JNIEnv* env, jobject object) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); if (nat) { dbus_connection_close(nat->conn); env->DeleteGlobalRef(nat->me); @@ -101,7 +101,7 @@ static void cleanupNative(JNIEnv* env, jobject object) { static jobjectArray getSinkPropertiesNative(JNIEnv *env, jobject object, jstring path) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); if (nat) { DBusMessage *msg, *reply; DBusError err; @@ -132,7 +132,7 @@ static jobjectArray getSinkPropertiesNative(JNIEnv *env, jobject object, static jboolean connectSinkNative(JNIEnv *env, jobject object, jstring path) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); if (nat) { const char *c_path = env->GetStringUTFChars(path, NULL); int len = env->GetStringLength(path) + 1; @@ -153,7 +153,7 @@ static jboolean connectSinkNative(JNIEnv *env, jobject object, jstring path) { static jboolean disconnectSinkNative(JNIEnv *env, jobject object, jstring path) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); if (nat) { const char *c_path = env->GetStringUTFChars(path, NULL); @@ -171,7 +171,7 @@ static jboolean disconnectSinkNative(JNIEnv *env, jobject object, static jboolean suspendSinkNative(JNIEnv *env, jobject object, jstring path) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); if (nat) { const char *c_path = env->GetStringUTFChars(path, NULL); bool ret = dbus_func_args_async(env, nat->conn, -1, NULL, NULL, nat, @@ -187,7 +187,7 @@ static jboolean suspendSinkNative(JNIEnv *env, jobject object, static jboolean resumeSinkNative(JNIEnv *env, jobject object, jstring path) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); if (nat) { const char *c_path = env->GetStringUTFChars(path, NULL); bool ret = dbus_func_args_async(env, nat->conn, -1, NULL, NULL, nat, @@ -203,7 +203,7 @@ static jboolean resumeSinkNative(JNIEnv *env, jobject object, static jboolean avrcpVolumeUpNative(JNIEnv *env, jobject object, jstring path) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); if (nat) { const char *c_path = env->GetStringUTFChars(path, NULL); bool ret = dbus_func_args_async(env, nat->conn, -1, NULL, NULL, nat, @@ -219,7 +219,7 @@ static jboolean avrcpVolumeUpNative(JNIEnv *env, jobject object, static jboolean avrcpVolumeDownNative(JNIEnv *env, jobject object, jstring path) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); if (nat) { const char *c_path = env->GetStringUTFChars(path, NULL); bool ret = dbus_func_args_async(env, nat->conn, -1, NULL, NULL, nat, @@ -237,8 +237,8 @@ DBusHandlerResult a2dp_event_filter(DBusMessage *msg, JNIEnv *env) { DBusError err; if (!nat) { - LOGV("... skipping %s\n", __FUNCTION__); - LOGV("... ignored\n"); + ALOGV("... skipping %s\n", __FUNCTION__); + ALOGV("... ignored\n"); return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } @@ -265,7 +265,7 @@ DBusHandlerResult a2dp_event_filter(DBusMessage *msg, JNIEnv *env) { result = DBUS_HANDLER_RESULT_HANDLED; return result; } else { - LOGV("... ignored"); + ALOGV("... ignored"); } if (env->ExceptionCheck()) { LOGE("VM Exception occurred while handling %s.%s (%s) in %s," @@ -278,7 +278,7 @@ DBusHandlerResult a2dp_event_filter(DBusMessage *msg, JNIEnv *env) { } void onConnectSinkResult(DBusMessage *msg, void *user, void *n) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); native_data_t *nat = (native_data_t *)n; const char *path = (const char *)user; @@ -293,7 +293,7 @@ void onConnectSinkResult(DBusMessage *msg, void *user, void *n) { LOG_AND_FREE_DBUS_ERROR(&err); result = JNI_FALSE; } - LOGV("... Device Path = %s, result = %d", path, result); + ALOGV("... Device Path = %s, result = %d", path, result); jstring jPath = env->NewStringUTF(path); env->CallVoidMethod(nat->me, diff --git a/core/jni/android_server_BluetoothEventLoop.cpp b/core/jni/android_server_BluetoothEventLoop.cpp index e8933fe..100fca4 100644 --- a/core/jni/android_server_BluetoothEventLoop.cpp +++ b/core/jni/android_server_BluetoothEventLoop.cpp @@ -91,7 +91,7 @@ native_data_t *get_EventLoop_native_data(JNIEnv *env, jobject object) { #endif static void classInitNative(JNIEnv* env, jclass clazz) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH method_onPropertyChanged = env->GetMethodID(clazz, "onPropertyChanged", @@ -157,7 +157,7 @@ static void classInitNative(JNIEnv* env, jclass clazz) { } static void initializeNativeDataNative(JNIEnv* env, jobject object) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = (native_data_t *)calloc(1, sizeof(native_data_t)); if (NULL == nat) { @@ -185,7 +185,7 @@ static void initializeNativeDataNative(JNIEnv* env, jobject object) { } static void cleanupNativeDataNative(JNIEnv* env, jobject object) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = (native_data_t *)env->GetIntField(object, field_mNativeData); @@ -226,7 +226,7 @@ static short dbus_flags_to_unix_events(unsigned int flags) { } static jboolean setUpEventLoop(native_data_t *nat) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); if (nat != NULL && nat->conn != NULL) { dbus_threads_init_default(); @@ -414,7 +414,7 @@ static int register_agent(native_data_t *nat, } static void tearDownEventLoop(native_data_t *nat) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); if (nat != NULL && nat->conn != NULL) { DBusMessage *msg, *reply; @@ -576,12 +576,12 @@ static void handleWatchAdd(native_data_t *nat) { for (int y = 0; y<nat->pollMemberCount; y++) { if ((nat->pollData[y].fd == newFD) && (nat->pollData[y].events == events)) { - LOGV("DBusWatch duplicate add"); + ALOGV("DBusWatch duplicate add"); return; } } if (nat->pollMemberCount == nat->pollDataSize) { - LOGV("Bluetooth EventLoop poll struct growing"); + ALOGV("Bluetooth EventLoop poll struct growing"); struct pollfd *temp = (struct pollfd *)malloc( sizeof(struct pollfd) * (nat->pollMemberCount+1)); if (!temp) { @@ -848,11 +848,11 @@ static DBusHandlerResult event_filter(DBusConnection *conn, DBusMessage *msg, nat = (native_data_t *)data; nat->vm->GetEnv((void**)&env, nat->envVer); if (dbus_message_get_type(msg) != DBUS_MESSAGE_TYPE_SIGNAL) { - LOGV("%s: not interested (not a signal).", __FUNCTION__); + ALOGV("%s: not interested (not a signal).", __FUNCTION__); return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } - LOGV("%s: Received signal %s:%s from %s", __FUNCTION__, + ALOGV("%s: Received signal %s:%s from %s", __FUNCTION__, dbus_message_get_interface(msg), dbus_message_get_member(msg), dbus_message_get_path(msg)); @@ -884,7 +884,7 @@ static DBusHandlerResult event_filter(DBusConnection *conn, DBusMessage *msg, if (dbus_message_get_args(msg, &err, DBUS_TYPE_STRING, &c_address, DBUS_TYPE_INVALID)) { - LOGV("... address = %s", c_address); + ALOGV("... address = %s", c_address); env->CallVoidMethod(nat->me, method_onDeviceDisappeared, env->NewStringUTF(c_address)); } else LOG_AND_FREE_DBUS_ERROR_WITH_MSG(&err, msg); @@ -896,7 +896,7 @@ static DBusHandlerResult event_filter(DBusConnection *conn, DBusMessage *msg, if (dbus_message_get_args(msg, &err, DBUS_TYPE_OBJECT_PATH, &c_object_path, DBUS_TYPE_INVALID)) { - LOGV("... address = %s", c_object_path); + ALOGV("... address = %s", c_object_path); env->CallVoidMethod(nat->me, method_onDeviceCreated, env->NewStringUTF(c_object_path)); @@ -909,7 +909,7 @@ static DBusHandlerResult event_filter(DBusConnection *conn, DBusMessage *msg, if (dbus_message_get_args(msg, &err, DBUS_TYPE_OBJECT_PATH, &c_object_path, DBUS_TYPE_INVALID)) { - LOGV("... Object Path = %s", c_object_path); + ALOGV("... Object Path = %s", c_object_path); env->CallVoidMethod(nat->me, method_onDeviceRemoved, env->NewStringUTF(c_object_path)); @@ -1094,7 +1094,7 @@ DBusHandlerResult agent_event_filter(DBusConnection *conn, native_data_t *nat = (native_data_t *)data; JNIEnv *env; if (dbus_message_get_type(msg) != DBUS_MESSAGE_TYPE_METHOD_CALL) { - LOGV("%s: not interested (not a method call).", __FUNCTION__); + ALOGV("%s: not interested (not a method call).", __FUNCTION__); return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } LOGI("%s: Received method %s:%s", __FUNCTION__, @@ -1130,8 +1130,8 @@ DBusHandlerResult agent_event_filter(DBusConnection *conn, goto failure; } - LOGV("... object_path = %s", object_path); - LOGV("... uuid = %s", uuid); + ALOGV("... object_path = %s", object_path); + ALOGV("... uuid = %s", uuid); dbus_message_ref(msg); // increment refcount because we pass to java env->CallVoidMethod(nat->me, method_onAgentAuthorize, @@ -1149,7 +1149,7 @@ DBusHandlerResult agent_event_filter(DBusConnection *conn, goto failure; } - LOGV("... object_path = %s", object_path); + ALOGV("... object_path = %s", object_path); bool available = env->CallBooleanMethod(nat->me, method_onAgentOutOfBandDataAvailable, @@ -1284,7 +1284,7 @@ DBusHandlerResult agent_event_filter(DBusConnection *conn, dbus_message_unref(reply); goto success; } else { - LOGV("%s:%s is ignored", dbus_message_get_interface(msg), dbus_message_get_member(msg)); + ALOGV("%s:%s is ignored", dbus_message_get_interface(msg), dbus_message_get_member(msg)); } failure: @@ -1302,7 +1302,7 @@ success: #ifdef HAVE_BLUETOOTH void onCreatePairedDeviceResult(DBusMessage *msg, void *user, void *n) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); native_data_t *nat = (native_data_t *)n; const char *address = (const char *)user; @@ -1313,45 +1313,45 @@ void onCreatePairedDeviceResult(DBusMessage *msg, void *user, void *n) { nat->vm->GetEnv((void**)&env, nat->envVer); - LOGV("... address = %s", address); + ALOGV("... address = %s", address); jint result = BOND_RESULT_SUCCESS; if (dbus_set_error_from_message(&err, msg)) { if (!strcmp(err.name, BLUEZ_DBUS_BASE_IFC ".Error.AuthenticationFailed")) { // Pins did not match, or remote device did not respond to pin // request in time - LOGV("... error = %s (%s)\n", err.name, err.message); + ALOGV("... error = %s (%s)\n", err.name, err.message); result = BOND_RESULT_AUTH_FAILED; } else if (!strcmp(err.name, BLUEZ_DBUS_BASE_IFC ".Error.AuthenticationRejected")) { // We rejected pairing, or the remote side rejected pairing. This // happens if either side presses 'cancel' at the pairing dialog. - LOGV("... error = %s (%s)\n", err.name, err.message); + ALOGV("... error = %s (%s)\n", err.name, err.message); result = BOND_RESULT_AUTH_REJECTED; } else if (!strcmp(err.name, BLUEZ_DBUS_BASE_IFC ".Error.AuthenticationCanceled")) { // Not sure if this happens - LOGV("... error = %s (%s)\n", err.name, err.message); + ALOGV("... error = %s (%s)\n", err.name, err.message); result = BOND_RESULT_AUTH_CANCELED; } else if (!strcmp(err.name, BLUEZ_DBUS_BASE_IFC ".Error.ConnectionAttemptFailed")) { // Other device is not responding at all - LOGV("... error = %s (%s)\n", err.name, err.message); + ALOGV("... error = %s (%s)\n", err.name, err.message); result = BOND_RESULT_REMOTE_DEVICE_DOWN; } else if (!strcmp(err.name, BLUEZ_DBUS_BASE_IFC ".Error.AlreadyExists")) { // already bonded - LOGV("... error = %s (%s)\n", err.name, err.message); + ALOGV("... error = %s (%s)\n", err.name, err.message); result = BOND_RESULT_SUCCESS; } else if (!strcmp(err.name, BLUEZ_DBUS_BASE_IFC ".Error.InProgress") && !strcmp(err.message, "Bonding in progress")) { - LOGV("... error = %s (%s)\n", err.name, err.message); + ALOGV("... error = %s (%s)\n", err.name, err.message); goto done; } else if (!strcmp(err.name, BLUEZ_DBUS_BASE_IFC ".Error.InProgress") && !strcmp(err.message, "Discover in progress")) { - LOGV("... error = %s (%s)\n", err.name, err.message); + ALOGV("... error = %s (%s)\n", err.name, err.message); result = BOND_RESULT_DISCOVERY_IN_PROGRESS; } else if (!strcmp(err.name, BLUEZ_DBUS_BASE_IFC ".Error.RepeatedAttempts")) { - LOGV("... error = %s (%s)\n", err.name, err.message); + ALOGV("... error = %s (%s)\n", err.name, err.message); result = BOND_RESULT_REPEATED_ATTEMPTS; } else if (!strcmp(err.name, BLUEZ_DBUS_BASE_IFC ".Error.AuthenticationTimeout")) { - LOGV("... error = %s (%s)\n", err.name, err.message); + ALOGV("... error = %s (%s)\n", err.name, err.message); result = BOND_RESULT_AUTH_TIMEOUT; } else { LOGE("%s: D-Bus error: %s (%s)\n", __FUNCTION__, err.name, err.message); @@ -1371,7 +1371,7 @@ done: } void onCreateDeviceResult(DBusMessage *msg, void *user, void *n) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); native_data_t *nat = (native_data_t *)n; const char *address= (const char *)user; @@ -1380,7 +1380,7 @@ void onCreateDeviceResult(DBusMessage *msg, void *user, void *n) { JNIEnv *env; nat->vm->GetEnv((void**)&env, nat->envVer); - LOGV("... Address = %s", address); + ALOGV("... Address = %s", address); jint result = CREATE_DEVICE_SUCCESS; if (dbus_set_error_from_message(&err, msg)) { @@ -1401,7 +1401,7 @@ void onCreateDeviceResult(DBusMessage *msg, void *user, void *n) { } void onDiscoverServicesResult(DBusMessage *msg, void *user, void *n) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); native_data_t *nat = (native_data_t *)n; const char *path = (const char *)user; @@ -1410,7 +1410,7 @@ void onDiscoverServicesResult(DBusMessage *msg, void *user, void *n) { JNIEnv *env; nat->vm->GetEnv((void**)&env, nat->envVer); - LOGV("... Device Path = %s", path); + ALOGV("... Device Path = %s", path); bool result = JNI_TRUE; if (dbus_set_error_from_message(&err, msg)) { @@ -1427,7 +1427,7 @@ void onDiscoverServicesResult(DBusMessage *msg, void *user, void *n) { } void onGetDeviceServiceChannelResult(DBusMessage *msg, void *user, void *n) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); const char *address = (const char *) user; native_data_t *nat = (native_data_t *) n; @@ -1439,7 +1439,7 @@ void onGetDeviceServiceChannelResult(DBusMessage *msg, void *user, void *n) { jint channel = -2; - LOGV("... address = %s", address); + ALOGV("... address = %s", address); if (dbus_set_error_from_message(&err, msg) || !dbus_message_get_args(msg, &err, @@ -1460,7 +1460,7 @@ done: } void onInputDeviceConnectionResult(DBusMessage *msg, void *user, void *n) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); native_data_t *nat = (native_data_t *)n; const char *path = (const char *)user; @@ -1488,7 +1488,7 @@ void onInputDeviceConnectionResult(DBusMessage *msg, void *user, void *n) { LOG_AND_FREE_DBUS_ERROR(&err); } - LOGV("... Device Path = %s, result = %d", path, result); + ALOGV("... Device Path = %s, result = %d", path, result); jstring jPath = env->NewStringUTF(path); env->CallVoidMethod(nat->me, method_onInputDeviceConnectionResult, @@ -1499,7 +1499,7 @@ void onInputDeviceConnectionResult(DBusMessage *msg, void *user, void *n) { } void onPanDeviceConnectionResult(DBusMessage *msg, void *user, void *n) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); native_data_t *nat = (native_data_t *)n; const char *path = (const char *)user; @@ -1527,7 +1527,7 @@ void onPanDeviceConnectionResult(DBusMessage *msg, void *user, void *n) { LOG_AND_FREE_DBUS_ERROR(&err); } - LOGV("... Pan Device Path = %s, result = %d", path, result); + ALOGV("... Pan Device Path = %s, result = %d", path, result); jstring jPath = env->NewStringUTF(path); env->CallVoidMethod(nat->me, method_onPanDeviceConnectionResult, @@ -1538,7 +1538,7 @@ void onPanDeviceConnectionResult(DBusMessage *msg, void *user, void *n) { } void onHealthDeviceConnectionResult(DBusMessage *msg, void *user, void *n) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); native_data_t *nat = (native_data_t *)n; DBusError err; @@ -1563,7 +1563,7 @@ void onHealthDeviceConnectionResult(DBusMessage *msg, void *user, void *n) { } jint code = *(int *) user; - LOGV("... Health Device Code = %d, result = %d", code, result); + ALOGV("... Health Device Code = %d, result = %d", code, result); env->CallVoidMethod(nat->me, method_onHealthDeviceConnectionResult, code, diff --git a/core/jni/android_server_BluetoothService.cpp b/core/jni/android_server_BluetoothService.cpp index a49c918..2aeca86 100644 --- a/core/jni/android_server_BluetoothService.cpp +++ b/core/jni/android_server_BluetoothService.cpp @@ -97,7 +97,7 @@ static inline native_data_t * get_native_data(JNIEnv *env, jobject object) { #endif static void classInitNative(JNIEnv* env, jclass clazz) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH field_mNativeData = get_field(env, clazz, "mNativeData", "I"); field_mEventLoop = get_field(env, clazz, "mEventLoop", @@ -109,7 +109,7 @@ static void classInitNative(JNIEnv* env, jclass clazz) { * Return false if dbus is down, or another serious error (out of memory) */ static bool initializeNativeDataNative(JNIEnv* env, jobject object) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = (native_data_t *)calloc(1, sizeof(native_data_t)); if (NULL == nat) { @@ -148,7 +148,7 @@ static const char *get_adapter_path(JNIEnv* env, jobject object) { // This function is called when the adapter is enabled. static jboolean setupNativeDataNative(JNIEnv* env, jobject object) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = (native_data_t *)env->GetIntField(object, field_mNativeData); @@ -171,7 +171,7 @@ static jboolean setupNativeDataNative(JNIEnv* env, jobject object) { } static jboolean tearDownNativeDataNative(JNIEnv *env, jobject object) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = (native_data_t *)env->GetIntField(object, field_mNativeData); @@ -185,7 +185,7 @@ static jboolean tearDownNativeDataNative(JNIEnv *env, jobject object) { } static void cleanupNativeDataNative(JNIEnv* env, jobject object) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = (native_data_t *)env->GetIntField(object, field_mNativeData); @@ -197,7 +197,7 @@ static void cleanupNativeDataNative(JNIEnv* env, jobject object) { } static jstring getAdapterPathNative(JNIEnv *env, jobject object) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = get_native_data(env, object); if (nat) { @@ -209,7 +209,7 @@ static jstring getAdapterPathNative(JNIEnv *env, jobject object) { static jboolean startDiscoveryNative(JNIEnv *env, jobject object) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH DBusMessage *msg = NULL; DBusMessage *reply = NULL; @@ -255,7 +255,7 @@ done: } static jboolean stopDiscoveryNative(JNIEnv *env, jobject object) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH DBusMessage *msg = NULL; DBusMessage *reply = NULL; @@ -287,7 +287,7 @@ static jboolean stopDiscoveryNative(JNIEnv *env, jobject object) { if(strncmp(err.name, BLUEZ_DBUS_BASE_IFC ".Error.NotAuthorized", strlen(BLUEZ_DBUS_BASE_IFC ".Error.NotAuthorized")) == 0) { // hcid sends this if there is no active discovery to cancel - LOGV("%s: There was no active discovery to cancel", __FUNCTION__); + ALOGV("%s: There was no active discovery to cancel", __FUNCTION__); dbus_error_free(&err); } else { LOG_AND_FREE_DBUS_ERROR_WITH_MSG(&err, msg); @@ -306,7 +306,7 @@ done: } static jbyteArray readAdapterOutOfBandDataNative(JNIEnv *env, jobject object) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = get_native_data(env, object); DBusError err; @@ -347,7 +347,7 @@ static jbyteArray readAdapterOutOfBandDataNative(JNIEnv *env, jobject object) { static jboolean createPairedDeviceNative(JNIEnv *env, jobject object, jstring address, jint timeout_ms) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = get_native_data(env, object); jobject eventLoop = env->GetObjectField(object, field_mEventLoop); @@ -356,7 +356,7 @@ static jboolean createPairedDeviceNative(JNIEnv *env, jobject object, if (nat && eventLoopNat) { const char *c_address = env->GetStringUTFChars(address, NULL); - LOGV("... address = %s", c_address); + ALOGV("... address = %s", c_address); char *context_address = (char *)calloc(BTADDR_SIZE, sizeof(char)); const char *capabilities = "DisplayYesNo"; const char *agent_path = "/android/bluetooth/remote_device_agent"; @@ -383,7 +383,7 @@ static jboolean createPairedDeviceNative(JNIEnv *env, jobject object, static jboolean createPairedDeviceOutOfBandNative(JNIEnv *env, jobject object, jstring address, jint timeout_ms) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = get_native_data(env, object); jobject eventLoop = env->GetObjectField(object, field_mEventLoop); @@ -392,7 +392,7 @@ static jboolean createPairedDeviceOutOfBandNative(JNIEnv *env, jobject object, if (nat && eventLoopNat) { const char *c_address = env->GetStringUTFChars(address, NULL); - LOGV("... address = %s", c_address); + ALOGV("... address = %s", c_address); char *context_address = (char *)calloc(BTADDR_SIZE, sizeof(char)); const char *capabilities = "DisplayYesNo"; const char *agent_path = "/android/bluetooth/remote_device_agent"; @@ -420,7 +420,7 @@ static jint getDeviceServiceChannelNative(JNIEnv *env, jobject object, jstring path, jstring pattern, jint attr_id) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); native_data_t *nat = get_native_data(env, object); jobject eventLoop = env->GetObjectField(object, field_mEventLoop); struct event_loop_native_data_t *eventLoopNat = @@ -428,8 +428,8 @@ static jint getDeviceServiceChannelNative(JNIEnv *env, jobject object, if (nat && eventLoopNat) { const char *c_pattern = env->GetStringUTFChars(pattern, NULL); const char *c_path = env->GetStringUTFChars(path, NULL); - LOGV("... pattern = %s", c_pattern); - LOGV("... attr_id = %#X", attr_id); + ALOGV("... pattern = %s", c_pattern); + ALOGV("... attr_id = %#X", attr_id); DBusMessage *reply = dbus_func_args(env, nat->conn, c_path, DBUS_DEVICE_IFACE, "GetServiceAttributeValue", @@ -446,7 +446,7 @@ static jint getDeviceServiceChannelNative(JNIEnv *env, jobject object, static jboolean cancelDeviceCreationNative(JNIEnv *env, jobject object, jstring address) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); jboolean result = JNI_FALSE; #ifdef HAVE_BLUETOOTH native_data_t *nat = get_native_data(env, object); @@ -454,7 +454,7 @@ static jboolean cancelDeviceCreationNative(JNIEnv *env, jobject object, const char *c_address = env->GetStringUTFChars(address, NULL); DBusError err; dbus_error_init(&err); - LOGV("... address = %s", c_address); + ALOGV("... address = %s", c_address); DBusMessage *reply = dbus_func_args_timeout(env, nat->conn, -1, get_adapter_path(env, object), @@ -478,7 +478,7 @@ static jboolean cancelDeviceCreationNative(JNIEnv *env, jobject object, } static jboolean removeDeviceNative(JNIEnv *env, jobject object, jstring object_path) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = get_native_data(env, object); if (nat) { @@ -501,7 +501,7 @@ static jboolean removeDeviceNative(JNIEnv *env, jobject object, jstring object_p static jint enableNative(JNIEnv *env, jobject object) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); return bt_enable(); #endif return -1; @@ -509,7 +509,7 @@ static jint enableNative(JNIEnv *env, jobject object) { static jint disableNative(JNIEnv *env, jobject object) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); return bt_disable(); #endif return -1; @@ -517,7 +517,7 @@ static jint disableNative(JNIEnv *env, jobject object) { static jint isEnabledNative(JNIEnv *env, jobject object) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); return bt_is_enabled(); #endif return -1; @@ -527,7 +527,7 @@ static jboolean setPairingConfirmationNative(JNIEnv *env, jobject object, jstring address, bool confirm, int nativeData) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); native_data_t *nat = get_native_data(env, object); if (nat) { DBusMessage *msg = (DBusMessage *)nativeData; @@ -558,7 +558,7 @@ static jboolean setPairingConfirmationNative(JNIEnv *env, jobject object, static jboolean setPasskeyNative(JNIEnv *env, jobject object, jstring address, int passkey, int nativeData) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); native_data_t *nat = get_native_data(env, object); if (nat) { DBusMessage *msg = (DBusMessage *)nativeData; @@ -585,7 +585,7 @@ static jboolean setPasskeyNative(JNIEnv *env, jobject object, jstring address, static jboolean setRemoteOutOfBandDataNative(JNIEnv *env, jobject object, jstring address, jbyteArray hash, jbyteArray randomizer, int nativeData) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); native_data_t *nat = get_native_data(env, object); if (nat) { DBusMessage *msg = (DBusMessage *)nativeData; @@ -619,7 +619,7 @@ static jboolean setRemoteOutOfBandDataNative(JNIEnv *env, jobject object, jstrin static jboolean setAuthorizationNative(JNIEnv *env, jobject object, jstring address, jboolean val, int nativeData) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); native_data_t *nat = get_native_data(env, object); if (nat) { DBusMessage *msg = (DBusMessage *)nativeData; @@ -648,7 +648,7 @@ static jboolean setAuthorizationNative(JNIEnv *env, jobject object, jstring addr static jboolean setPinNative(JNIEnv *env, jobject object, jstring address, jstring pin, int nativeData) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); native_data_t *nat = get_native_data(env, object); if (nat) { DBusMessage *msg = (DBusMessage *)nativeData; @@ -678,7 +678,7 @@ static jboolean setPinNative(JNIEnv *env, jobject object, jstring address, static jboolean cancelPairingUserInputNative(JNIEnv *env, jobject object, jstring address, int nativeData) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); native_data_t *nat = get_native_data(env, object); if (nat) { DBusMessage *msg = (DBusMessage *)nativeData; @@ -704,7 +704,7 @@ static jobjectArray getDevicePropertiesNative(JNIEnv *env, jobject object, jstring path) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); native_data_t *nat = get_native_data(env, object); if (nat) { DBusMessage *msg, *reply; @@ -741,7 +741,7 @@ static jobjectArray getDevicePropertiesNative(JNIEnv *env, jobject object, static jobjectArray getAdapterPropertiesNative(JNIEnv *env, jobject object) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); native_data_t *nat = get_native_data(env, object); if (nat) { DBusMessage *msg, *reply; @@ -776,7 +776,7 @@ static jobjectArray getAdapterPropertiesNative(JNIEnv *env, jobject object) { static jboolean setAdapterPropertyNative(JNIEnv *env, jobject object, jstring key, void *value, jint type) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); native_data_t *nat = get_native_data(env, object); if (nat) { DBusMessage *msg; @@ -843,7 +843,7 @@ static jboolean setAdapterPropertyBooleanNative(JNIEnv *env, jobject object, jst static jboolean setDevicePropertyNative(JNIEnv *env, jobject object, jstring path, jstring key, void *value, jint type) { #ifdef HAVE_BLUETOOTH - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); native_data_t *nat = get_native_data(env, object); if (nat) { DBusMessage *msg; @@ -904,7 +904,7 @@ static jboolean setDevicePropertyStringNative(JNIEnv *env, jobject object, static jboolean createDeviceNative(JNIEnv *env, jobject object, jstring address) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = get_native_data(env, object); jobject eventLoop = env->GetObjectField(object, field_mEventLoop); @@ -913,7 +913,7 @@ static jboolean createDeviceNative(JNIEnv *env, jobject object, if (nat && eventLoopNat) { const char *c_address = env->GetStringUTFChars(address, NULL); - LOGV("... address = %s", c_address); + ALOGV("... address = %s", c_address); char *context_address = (char *)calloc(BTADDR_SIZE, sizeof(char)); strlcpy(context_address, c_address, BTADDR_SIZE); // for callback @@ -935,7 +935,7 @@ static jboolean createDeviceNative(JNIEnv *env, jobject object, static jboolean discoverServicesNative(JNIEnv *env, jobject object, jstring path, jstring pattern) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = get_native_data(env, object); jobject eventLoop = env->GetObjectField(object, field_mEventLoop); @@ -949,8 +949,8 @@ static jboolean discoverServicesNative(JNIEnv *env, jobject object, char *context_path = (char *)calloc(len, sizeof(char)); strlcpy(context_path, c_path, len); // for callback - LOGV("... Object Path = %s", c_path); - LOGV("... Pattern = %s, strlen = %d", c_pattern, strlen(c_pattern)); + ALOGV("... Object Path = %s", c_path); + ALOGV("... Pattern = %s, strlen = %d", c_pattern, strlen(c_pattern)); bool ret = dbus_func_args_async(env, nat->conn, -1, onDiscoverServicesResult, @@ -996,7 +996,7 @@ static jintArray extract_handles(JNIEnv *env, DBusMessage *reply) { static jintArray addReservedServiceRecordsNative(JNIEnv *env, jobject object, jintArray uuids) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH DBusMessage *reply = NULL; @@ -1020,7 +1020,7 @@ static jintArray addReservedServiceRecordsNative(JNIEnv *env, jobject object, static jboolean removeReservedServiceRecordsNative(JNIEnv *env, jobject object, jintArray handles) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = get_native_data(env, object); jint *values = env->GetIntArrayElements(handles, NULL); @@ -1043,15 +1043,15 @@ static jboolean removeReservedServiceRecordsNative(JNIEnv *env, jobject object, static jint addRfcommServiceRecordNative(JNIEnv *env, jobject object, jstring name, jlong uuidMsb, jlong uuidLsb, jshort channel) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = get_native_data(env, object); if (nat) { const char *c_name = env->GetStringUTFChars(name, NULL); - LOGV("... name = %s", c_name); - LOGV("... uuid1 = %llX", uuidMsb); - LOGV("... uuid2 = %llX", uuidLsb); - LOGV("... channel = %d", channel); + ALOGV("... name = %s", c_name); + ALOGV("... uuid1 = %llX", uuidMsb); + ALOGV("... uuid2 = %llX", uuidLsb); + ALOGV("... channel = %d", channel); DBusMessage *reply = dbus_func_args(env, nat->conn, get_adapter_path(env, object), DBUS_ADAPTER_IFACE, "AddRfcommServiceRecord", @@ -1068,11 +1068,11 @@ static jint addRfcommServiceRecordNative(JNIEnv *env, jobject object, } static jboolean removeServiceRecordNative(JNIEnv *env, jobject object, jint handle) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = get_native_data(env, object); if (nat) { - LOGV("... handle = %X", handle); + ALOGV("... handle = %X", handle); DBusMessage *reply = dbus_func_args(env, nat->conn, get_adapter_path(env, object), DBUS_ADAPTER_IFACE, "RemoveServiceRecord", @@ -1086,7 +1086,7 @@ static jboolean removeServiceRecordNative(JNIEnv *env, jobject object, jint hand static jboolean setLinkTimeoutNative(JNIEnv *env, jobject object, jstring object_path, jint num_slots) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = get_native_data(env, object); if (nat) { @@ -1105,7 +1105,7 @@ static jboolean setLinkTimeoutNative(JNIEnv *env, jobject object, jstring object } static jboolean connectInputDeviceNative(JNIEnv *env, jobject object, jstring path) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = get_native_data(env, object); jobject eventLoop = env->GetObjectField(object, field_mEventLoop); @@ -1133,7 +1133,7 @@ static jboolean connectInputDeviceNative(JNIEnv *env, jobject object, jstring pa static jboolean disconnectInputDeviceNative(JNIEnv *env, jobject object, jstring path) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = get_native_data(env, object); jobject eventLoop = env->GetObjectField(object, field_mEventLoop); @@ -1161,7 +1161,7 @@ static jboolean disconnectInputDeviceNative(JNIEnv *env, jobject object, static jboolean setBluetoothTetheringNative(JNIEnv *env, jobject object, jboolean value, jstring src_role, jstring bridge) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = get_native_data(env, object); if (nat) { @@ -1196,7 +1196,7 @@ static jboolean setBluetoothTetheringNative(JNIEnv *env, jobject object, jboolea static jboolean connectPanDeviceNative(JNIEnv *env, jobject object, jstring path, jstring dstRole) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH LOGE("connectPanDeviceNative"); native_data_t *nat = get_native_data(env, object); @@ -1228,7 +1228,7 @@ static jboolean connectPanDeviceNative(JNIEnv *env, jobject object, jstring path static jboolean disconnectPanDeviceNative(JNIEnv *env, jobject object, jstring path) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH LOGE("disconnectPanDeviceNative"); native_data_t *nat = get_native_data(env, object); @@ -1258,7 +1258,7 @@ static jboolean disconnectPanDeviceNative(JNIEnv *env, jobject object, static jboolean disconnectPanServerDeviceNative(JNIEnv *env, jobject object, jstring path, jstring address, jstring iface) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH LOGE("disconnectPanServerDeviceNative"); native_data_t *nat = get_native_data(env, object); @@ -1297,7 +1297,7 @@ static jboolean disconnectPanServerDeviceNative(JNIEnv *env, jobject object, static jstring registerHealthApplicationNative(JNIEnv *env, jobject object, jint dataType, jstring role, jstring name, jstring channelType) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); jstring path = NULL; #ifdef HAVE_BLUETOOTH native_data_t *nat = get_native_data(env, object); @@ -1360,7 +1360,7 @@ static jstring registerHealthApplicationNative(JNIEnv *env, jobject object, static jstring registerSinkHealthApplicationNative(JNIEnv *env, jobject object, jint dataType, jstring role, jstring name) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); jstring path = NULL; #ifdef HAVE_BLUETOOTH native_data_t *nat = get_native_data(env, object); @@ -1420,7 +1420,7 @@ static jstring registerSinkHealthApplicationNative(JNIEnv *env, jobject object, static jboolean unregisterHealthApplicationNative(JNIEnv *env, jobject object, jstring path) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); jboolean result = JNI_FALSE; #ifdef HAVE_BLUETOOTH native_data_t *nat = get_native_data(env, object); @@ -1452,7 +1452,7 @@ static jboolean unregisterHealthApplicationNative(JNIEnv *env, jobject object, static jboolean createChannelNative(JNIEnv *env, jobject object, jstring devicePath, jstring appPath, jstring config, jint code) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = get_native_data(env, object); jobject eventLoop = env->GetObjectField(object, field_mEventLoop); @@ -1599,7 +1599,7 @@ static jstring getChannelApplicationNative(JNIEnv *env, jobject object, jstring } static jboolean releaseChannelFdNative(JNIEnv *env, jobject object, jstring channelPath) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = get_native_data(env, object); if (nat) { @@ -1620,7 +1620,7 @@ static jboolean releaseChannelFdNative(JNIEnv *env, jobject object, jstring chan } static jobject getChannelFdNative(JNIEnv *env, jobject object, jstring channelPath) { - LOGV("%s", __FUNCTION__); + ALOGV("%s", __FUNCTION__); #ifdef HAVE_BLUETOOTH native_data_t *nat = get_native_data(env, object); if (nat) { diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp index 4f8f1af..6ecee35 100644 --- a/core/jni/android_util_AssetManager.cpp +++ b/core/jni/android_util_AssetManager.cpp @@ -121,7 +121,7 @@ static jint android_content_AssetManager_openAsset(JNIEnv* env, jobject clazz, return 0; } - LOGV("openAsset in %p (Java object %p)\n", am, clazz); + ALOGV("openAsset in %p (Java object %p)\n", am, clazz); ScopedUtfChars fileName8(env, fileName); if (fileName8.c_str() == NULL) { @@ -186,7 +186,7 @@ static jobject android_content_AssetManager_openAssetFd(JNIEnv* env, jobject cla return NULL; } - LOGV("openAssetFd in %p (Java object %p)\n", am, clazz); + ALOGV("openAssetFd in %p (Java object %p)\n", am, clazz); ScopedUtfChars fileName8(env, fileName); if (fileName8.c_str() == NULL) { @@ -215,7 +215,7 @@ static jint android_content_AssetManager_openNonAssetNative(JNIEnv* env, jobject return 0; } - LOGV("openNonAssetNative in %p (Java object %p)\n", am, clazz); + ALOGV("openNonAssetNative in %p (Java object %p)\n", am, clazz); ScopedUtfChars fileName8(env, fileName); if (fileName8.c_str() == NULL) { @@ -252,7 +252,7 @@ static jobject android_content_AssetManager_openNonAssetFdNative(JNIEnv* env, jo return NULL; } - LOGV("openNonAssetFd in %p (Java object %p)\n", am, clazz); + ALOGV("openNonAssetFd in %p (Java object %p)\n", am, clazz); ScopedUtfChars fileName8(env, fileName); if (fileName8.c_str() == NULL) { @@ -1365,7 +1365,7 @@ static jint android_content_AssetManager_openXmlAssetNative(JNIEnv* env, jobject return 0; } - LOGV("openXmlAsset in %p (Java object %p)\n", am, clazz); + ALOGV("openXmlAsset in %p (Java object %p)\n", am, clazz); ScopedUtfChars fileName8(env, fileName); if (fileName8.c_str() == NULL) { @@ -1571,7 +1571,7 @@ static void android_content_AssetManager_init(JNIEnv* env, jobject clazz) am->addDefaultAssets(); - LOGV("Created AssetManager %p for Java object %p\n", am, clazz); + ALOGV("Created AssetManager %p for Java object %p\n", am, clazz); env->SetIntField(clazz, gAssetManagerOffsets.mObject, (jint)am); } @@ -1579,7 +1579,7 @@ static void android_content_AssetManager_destroy(JNIEnv* env, jobject clazz) { AssetManager* am = (AssetManager*) (env->GetIntField(clazz, gAssetManagerOffsets.mObject)); - LOGV("Destroying AssetManager %p for Java object %p\n", am, clazz); + ALOGV("Destroying AssetManager %p for Java object %p\n", am, clazz); if (am != NULL) { delete am; env->SetIntField(clazz, gAssetManagerOffsets.mObject, 0); diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp index 2bd4fa0..bd62268 100644 --- a/core/jni/android_util_Binder.cpp +++ b/core/jni/android_util_Binder.cpp @@ -45,14 +45,14 @@ #include <android_runtime/AndroidRuntime.h> -//#undef LOGV -//#define LOGV(...) fprintf(stderr, __VA_ARGS__) +//#undef ALOGV +//#define ALOGV(...) fprintf(stderr, __VA_ARGS__) #define DEBUG_DEATH 0 #if DEBUG_DEATH #define LOGDEATH LOGD #else -#define LOGDEATH LOGV +#define LOGDEATH ALOGV #endif using namespace android; @@ -169,7 +169,7 @@ static void incRefsCreated(JNIEnv* env) env->CallStaticVoidMethod(gBinderInternalOffsets.mClass, gBinderInternalOffsets.mForceGc); } else { - LOGV("Now have %d binder ops", old); + ALOGV("Now have %d binder ops", old); } } @@ -249,7 +249,7 @@ public: JavaBBinder(JNIEnv* env, jobject object) : mVM(jnienv_to_javavm(env)), mObject(env->NewGlobalRef(object)) { - LOGV("Creating JavaBBinder %p\n", this); + ALOGV("Creating JavaBBinder %p\n", this); android_atomic_inc(&gNumLocalRefs); incRefsCreated(env); } @@ -267,7 +267,7 @@ public: protected: virtual ~JavaBBinder() { - LOGV("Destroying JavaBBinder %p\n", this); + ALOGV("Destroying JavaBBinder %p\n", this); android_atomic_dec(&gNumLocalRefs); JNIEnv* env = javavm_to_jnienv(mVM); env->DeleteGlobalRef(mObject); @@ -278,7 +278,7 @@ protected: { JNIEnv* env = javavm_to_jnienv(mVM); - LOGV("onTransact() on %p calling object %p in env %p vm %p\n", this, mObject, env, mVM); + ALOGV("onTransact() on %p calling object %p in env %p vm %p\n", this, mObject, env, mVM); IPCThreadState* thread_state = IPCThreadState::self(); const int strict_policy_before = thread_state->getStrictModePolicy(); @@ -349,7 +349,7 @@ public: if (b == NULL) { b = new JavaBBinder(env, obj); mBinder = b; - LOGV("Creating JavaBinder %p (refs %p) for Object %p, weakCount=%d\n", + ALOGV("Creating JavaBinder %p (refs %p) for Object %p, weakCount=%d\n", b.get(), b->getWeakRefs(), obj, b->getWeakRefs()->getWeakCount()); } @@ -579,7 +579,7 @@ jobject javaObjectForIBinder(JNIEnv* env, const sp<IBinder>& val) if (object != NULL) { jobject res = env->CallObjectMethod(object, gWeakReferenceOffsets.mGet); if (res != NULL) { - LOGV("objectForBinder %p: found existing %p!\n", val.get(), res); + ALOGV("objectForBinder %p: found existing %p!\n", val.get(), res); return res; } LOGDEATH("Proxy object %p of IBinder %p no longer in working set!!!", object, val.get()); @@ -780,7 +780,7 @@ static void android_os_Binder_init(JNIEnv* env, jobject obj) jniThrowException(env, "java/lang/OutOfMemoryError", NULL); return; } - LOGV("Java Binder %p: acquiring first ref on holder %p", obj, jbh); + ALOGV("Java Binder %p: acquiring first ref on holder %p", obj, jbh); jbh->incStrong((void*)android_os_Binder_init); env->SetIntField(obj, gBinderOffsets.mObject, (int)jbh); } @@ -791,7 +791,7 @@ static void android_os_Binder_destroy(JNIEnv* env, jobject obj) env->GetIntField(obj, gBinderOffsets.mObject); if (jbh != NULL) { env->SetIntField(obj, gBinderOffsets.mObject, 0); - LOGV("Java Binder %p: removing ref on holder %p", obj, jbh); + ALOGV("Java Binder %p: removing ref on holder %p", obj, jbh); jbh->decStrong((void*)android_os_Binder_init); } else { // Encountering an uninitialized binder is harmless. All it means is that @@ -800,7 +800,7 @@ static void android_os_Binder_destroy(JNIEnv* env, jobject obj) // For example, a Binder subclass constructor might have thrown an exception before // it could delegate to its superclass's constructor. Consequently init() would // not have been called and the holder pointer would remain NULL. - LOGV("Java Binder %p: ignoring uninitialized binder", obj); + ALOGV("Java Binder %p: ignoring uninitialized binder", obj); } } @@ -889,7 +889,7 @@ static void android_os_BinderInternal_disableBackgroundScheduling(JNIEnv* env, static void android_os_BinderInternal_handleGc(JNIEnv* env, jobject clazz) { - LOGV("Gc has executed, clearing binder ops"); + ALOGV("Gc has executed, clearing binder ops"); android_atomic_and(0, &gNumRefsCreated); } @@ -1078,7 +1078,7 @@ static jboolean android_os_BinderProxy_transact(JNIEnv* env, jobject obj, return JNI_FALSE; } - LOGV("Java code calling transact on %p in Java object %p with code %d\n", + ALOGV("Java code calling transact on %p in Java object %p with code %d\n", target, obj, code); // Only log the binder call duration for things on the Java-level main thread. diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp index 47d343a..e7626bc 100644 --- a/core/jni/android_util_Process.cpp +++ b/core/jni/android_util_Process.cpp @@ -251,7 +251,7 @@ static void android_os_Process_setCanSelfBackground(JNIEnv* env, jobject clazz, // Establishes the calling thread as illegal to put into the background. // Typically used only for the system process's main looper. #if GUARD_THREAD_PRIORITY - LOGV("Process.setCanSelfBackground(%d) : tid=%d", bgOk, androidGetTid()); + ALOGV("Process.setCanSelfBackground(%d) : tid=%d", bgOk, androidGetTid()); { Mutex::Autolock _l(gKeyCreateMutex); if (gBgKey == -1) { diff --git a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp index 95c9b49..97a729e 100644 --- a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp +++ b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp @@ -101,7 +101,7 @@ isFileDifferent(const char* filePath, size_t fileSize, time_t modifiedTime, { if (lstat64(filePath, st) < 0) { // File is not found or cannot be read. - LOGV("Couldn't stat %s, copying: %s\n", filePath, strerror(errno)); + ALOGV("Couldn't stat %s, copying: %s\n", filePath, strerror(errno)); return true; } @@ -115,13 +115,13 @@ isFileDifferent(const char* filePath, size_t fileSize, time_t modifiedTime, // For some reason, bionic doesn't define st_mtime as time_t if (time_t(st->st_mtime) != modifiedTime) { - LOGV("mod time doesn't match: %ld vs. %ld\n", st->st_mtime, modifiedTime); + ALOGV("mod time doesn't match: %ld vs. %ld\n", st->st_mtime, modifiedTime); return true; } int fd = TEMP_FAILURE_RETRY(open(filePath, O_RDONLY)); if (fd < 0) { - LOGV("Couldn't open file %s: %s", filePath, strerror(errno)); + ALOGV("Couldn't open file %s: %s", filePath, strerror(errno)); return true; } @@ -133,7 +133,7 @@ isFileDifferent(const char* filePath, size_t fileSize, time_t modifiedTime, } close(fd); - LOGV("%s: crc = %lx, zipCrc = %lx\n", filePath, crc, zipCrc); + ALOGV("%s: crc = %lx, zipCrc = %lx\n", filePath, crc, zipCrc); if (crc != zipCrc) { return true; @@ -261,7 +261,7 @@ copyFileIfChanged(JNIEnv *env, void* arg, ZipFileRO* zipFile, ZipEntryRO zipEntr return INSTALL_FAILED_CONTAINER_ERROR; } - LOGV("Successfully moved %s to %s\n", localTmpFileName, localFileName); + ALOGV("Successfully moved %s to %s\n", localTmpFileName, localFileName); return INSTALL_SUCCEEDED; } @@ -315,11 +315,11 @@ iterateOverNativeFiles(JNIEnv *env, jstring javaFilePath, jstring javaCpuAbi, js const char* cpuAbiOffset = fileName + APK_LIB_LEN; const size_t cpuAbiRegionSize = lastSlash - cpuAbiOffset; - LOGV("Comparing ABIs %s and %s versus %s\n", cpuAbi.c_str(), cpuAbi2.c_str(), cpuAbiOffset); + ALOGV("Comparing ABIs %s and %s versus %s\n", cpuAbi.c_str(), cpuAbi2.c_str(), cpuAbiOffset); if (cpuAbi.size() == cpuAbiRegionSize && *(cpuAbiOffset + cpuAbi.size()) == '/' && !strncmp(cpuAbiOffset, cpuAbi.c_str(), cpuAbiRegionSize)) { - LOGV("Using primary ABI %s\n", cpuAbi.c_str()); + ALOGV("Using primary ABI %s\n", cpuAbi.c_str()); hasPrimaryAbi = true; } else if (cpuAbi2.size() == cpuAbiRegionSize && *(cpuAbiOffset + cpuAbi2.size()) == '/' @@ -330,13 +330,13 @@ iterateOverNativeFiles(JNIEnv *env, jstring javaFilePath, jstring javaCpuAbi, js * only use the primary ABI. */ if (hasPrimaryAbi) { - LOGV("Already saw primary ABI, skipping secondary ABI %s\n", cpuAbi2.c_str()); + ALOGV("Already saw primary ABI, skipping secondary ABI %s\n", cpuAbi2.c_str()); continue; } else { - LOGV("Using secondary ABI %s\n", cpuAbi2.c_str()); + ALOGV("Using secondary ABI %s\n", cpuAbi2.c_str()); } } else { - LOGV("abi didn't match anything: %s (end at %zd)\n", cpuAbiOffset, cpuAbiRegionSize); + ALOGV("abi didn't match anything: %s (end at %zd)\n", cpuAbiOffset, cpuAbiRegionSize); continue; } @@ -349,7 +349,7 @@ iterateOverNativeFiles(JNIEnv *env, jstring javaFilePath, jstring javaCpuAbi, js install_status_t ret = callFunc(env, callArg, &zipFile, entry, lastSlash + 1); if (ret != INSTALL_SUCCEEDED) { - LOGV("Failure for entry %s", lastSlash + 1); + ALOGV("Failure for entry %s", lastSlash + 1); return ret; } } |