diff options
104 files changed, 390 insertions, 390 deletions
diff --git a/cmds/bootanimation/bootanimation_main.cpp b/cmds/bootanimation/bootanimation_main.cpp index 5f8b744..ff809d3 100644 --- a/cmds/bootanimation/bootanimation_main.cpp +++ b/cmds/bootanimation/bootanimation_main.cpp @@ -47,7 +47,7 @@ int main(int argc, char** argv) char value[PROPERTY_VALUE_MAX]; property_get("debug.sf.nobootanimation", value, "0"); int noBootAnimation = atoi(value); - LOGI_IF(noBootAnimation, "boot animation disabled"); + ALOGI_IF(noBootAnimation, "boot animation disabled"); if (!noBootAnimation) { sp<ProcessState> proc(ProcessState::self()); diff --git a/cmds/dumpstate/dumpstate.c b/cmds/dumpstate/dumpstate.c index 395c28b..a07a408 100644 --- a/cmds/dumpstate/dumpstate.c +++ b/cmds/dumpstate/dumpstate.c @@ -84,9 +84,9 @@ static void dumpstate() { dump_file("BUDDYINFO", "/proc/buddyinfo"); if (screenshot_path[0]) { - LOGI("taking screenshot\n"); + ALOGI("taking screenshot\n"); run_command(NULL, 5, "su", "root", "screenshot", screenshot_path, NULL); - LOGI("wrote screenshot: %s\n", screenshot_path); + ALOGI("wrote screenshot: %s\n", screenshot_path); } run_command("SYSTEM LOG", 20, "logcat", "-v", "threadtime", "-d", "*:v", NULL); @@ -271,7 +271,7 @@ int main(int argc, char *argv[]) { int use_socket = 0; int do_fb = 0; - LOGI("begin\n"); + ALOGI("begin\n"); /* set as high priority, and protect from OOM killer */ setpriority(PRIO_PROCESS, 0, -20); @@ -386,7 +386,7 @@ int main(int argc, char *argv[]) { fprintf(stderr, "rename(%s, %s): %s\n", tmp_path, path, strerror(errno)); } - LOGI("done\n"); + ALOGI("done\n"); return 0; } diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c index db72585..988fee3 100644 --- a/cmds/installd/commands.c +++ b/cmds/installd/commands.c @@ -189,7 +189,7 @@ int free_cache(int64_t free_size) avail = disk_free(); if (avail < 0) return -1; - LOGI("free_cache(%" PRId64 ") avail %" PRId64 "\n", free_size, avail); + ALOGI("free_cache(%" PRId64 ") avail %" PRId64 "\n", free_size, avail); if (avail >= free_size) return 0; if (create_persona_path(datadir, 0)) { diff --git a/cmds/installd/installd.c b/cmds/installd/installd.c index feb6b92..159bccb 100644 --- a/cmds/installd/installd.c +++ b/cmds/installd/installd.c @@ -200,7 +200,7 @@ static int execute(int s, char cmd[BUFFER_MAX]) unsigned short count; int ret = -1; -// LOGI("execute('%s')\n", cmd); +// ALOGI("execute('%s')\n", cmd); /* default reply is "" */ reply[0] = 0; @@ -242,7 +242,7 @@ done: if (n > BUFFER_MAX) n = BUFFER_MAX; count = n; -// LOGI("reply: '%s'\n", cmd); +// ALOGI("reply: '%s'\n", cmd); if (writex(s, &count, sizeof(count))) return -1; if (writex(s, cmd, count)) return -1; return 0; @@ -380,7 +380,7 @@ int main(const int argc, const char *argv[]) { } fcntl(s, F_SETFD, FD_CLOEXEC); - LOGI("new connection\n"); + ALOGI("new connection\n"); for (;;) { unsigned short count; if (readx(s, &count, sizeof(count))) { @@ -398,7 +398,7 @@ int main(const int argc, const char *argv[]) { buf[count] = 0; if (execute(s, buf)) break; } - LOGI("closing connection\n"); + ALOGI("closing connection\n"); close(s); } diff --git a/cmds/keystore/keystore.cpp b/cmds/keystore/keystore.cpp index 4b4b9b9..d8380a5 100644 --- a/cmds/keystore/keystore.cpp +++ b/cmds/keystore/keystore.cpp @@ -796,7 +796,7 @@ int main(int argc, char* argv[]) { } else { send_code(sock, response); } - LOGI("uid: %d action: %c -> %d state: %d -> %d retry: %d", + ALOGI("uid: %d action: %c -> %d state: %d -> %d retry: %d", cred.uid, request, response, old_state, keyStore.getState(), diff --git a/cmds/servicemanager/service_manager.c b/cmds/servicemanager/service_manager.c index 2df450f..6ad114a 100644 --- a/cmds/servicemanager/service_manager.c +++ b/cmds/servicemanager/service_manager.c @@ -11,7 +11,7 @@ #include "binder.h" #if 0 -#define LOGI(x...) fprintf(stderr, "svcmgr: " x) +#define ALOGI(x...) fprintf(stderr, "svcmgr: " x) #define LOGE(x...) fprintf(stderr, "svcmgr: " x) #else #define LOG_TAG "ServiceManager" @@ -115,7 +115,7 @@ struct svcinfo *find_svc(uint16_t *s16, unsigned len) void svcinfo_death(struct binder_state *bs, void *ptr) { struct svcinfo *si = ptr; - LOGI("service '%s' died\n", str8(si->name)); + ALOGI("service '%s' died\n", str8(si->name)); if (si->ptr) { binder_release(bs, si->ptr); si->ptr = 0; @@ -133,7 +133,7 @@ void *do_find_service(struct binder_state *bs, uint16_t *s, unsigned len) struct svcinfo *si; si = find_svc(s, len); -// LOGI("check_service('%s') ptr = %p\n", str8(s), si ? si->ptr : 0); +// ALOGI("check_service('%s') ptr = %p\n", str8(s), si ? si->ptr : 0); if (si && si->ptr) { return si->ptr; } else { @@ -146,7 +146,7 @@ int do_add_service(struct binder_state *bs, void *ptr, unsigned uid) { struct svcinfo *si; -// LOGI("add_service('%s',%p) uid=%d\n", str8(s), ptr, uid); +// ALOGI("add_service('%s',%p) uid=%d\n", str8(s), ptr, uid); if (!ptr || (len == 0) || (len > 127)) return -1; @@ -198,7 +198,7 @@ int svcmgr_handler(struct binder_state *bs, void *ptr; uint32_t strict_policy; -// LOGI("target=%p code=%d pid=%d uid=%d\n", +// ALOGI("target=%p code=%d pid=%d uid=%d\n", // txn->target, txn->code, txn->sender_pid, txn->sender_euid); if (txn->target != svcmgr_handle) diff --git a/cmds/stagefright/record.cpp b/cmds/stagefright/record.cpp index b718299..613435d 100644 --- a/cmds/stagefright/record.cpp +++ b/cmds/stagefright/record.cpp @@ -96,7 +96,7 @@ public: ++mNumFramesOutput; // printf("DummySource::read - returning buffer\n"); - // LOGI("DummySource::read - returning buffer"); + // ALOGI("DummySource::read - returning buffer"); return OK; } diff --git a/cmds/stagefright/stream.cpp b/cmds/stagefright/stream.cpp index 24403dc..0d6c738 100644 --- a/cmds/stagefright/stream.cpp +++ b/cmds/stagefright/stream.cpp @@ -90,7 +90,7 @@ void MyStreamSource::onBufferAvailable(size_t index) { #if 0 if (mNumPacketsSent >= 20000) { - LOGI("signalling discontinuity now"); + ALOGI("signalling discontinuity now"); off64_t offset = 0; CHECK((offset % 188) == 0); diff --git a/cmds/system_server/library/system_init.cpp b/cmds/system_server/library/system_init.cpp index 59360d3..bfbc138 100644 --- a/cmds/system_server/library/system_init.cpp +++ b/cmds/system_server/library/system_init.cpp @@ -42,7 +42,7 @@ public: virtual void binderDied(const wp<IBinder>& who) { - LOGI("Grim Reaper killing system_server..."); + ALOGI("Grim Reaper killing system_server..."); kill(getpid(), SIGKILL); } }; @@ -53,12 +53,12 @@ public: extern "C" status_t system_init() { - LOGI("Entered system_init()"); + ALOGI("Entered system_init()"); sp<ProcessState> proc(ProcessState::self()); sp<IServiceManager> sm = defaultServiceManager(); - LOGI("ServiceManager: %p\n", sm.get()); + ALOGI("ServiceManager: %p\n", sm.get()); sp<GrimReaper> grim = new GrimReaper(); sm->asBinder()->linkToDeath(grim, grim.get(), 0); @@ -82,10 +82,10 @@ extern "C" status_t system_init() // All other servers should just start the Android runtime at // the beginning of their processes's main(), before calling // the init function. - LOGI("System server: starting Android runtime.\n"); + ALOGI("System server: starting Android runtime.\n"); AndroidRuntime* runtime = AndroidRuntime::getRuntime(); - LOGI("System server: starting Android services.\n"); + ALOGI("System server: starting Android services.\n"); JNIEnv* env = runtime->getJNIEnv(); if (env == NULL) { return UNKNOWN_ERROR; @@ -100,10 +100,10 @@ extern "C" status_t system_init() } env->CallStaticVoidMethod(clazz, methodId); - LOGI("System server: entering thread pool.\n"); + ALOGI("System server: entering thread pool.\n"); ProcessState::self()->startThreadPool(); IPCThreadState::self()->joinThreadPool(); - LOGI("System server: exiting thread pool.\n"); + ALOGI("System server: exiting thread pool.\n"); return NO_ERROR; } diff --git a/cmds/system_server/system_main.cpp b/cmds/system_server/system_main.cpp index d67329d..de00326 100644 --- a/cmds/system_server/system_main.cpp +++ b/cmds/system_server/system_main.cpp @@ -44,7 +44,7 @@ static void blockSignals() int main(int argc, const char* const argv[]) { - LOGI("System server is starting with pid=%d.\n", getpid()); + ALOGI("System server is starting with pid=%d.\n", getpid()); blockSignals(); diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 23d36a6..f88456a 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -704,7 +704,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) /* accept "all" to mean "all classes and packages" */ if (strcmp(enableAssertBuf+4, "all") == 0) enableAssertBuf[3] = '\0'; - LOGI("Assertions enabled: '%s'\n", enableAssertBuf); + ALOGI("Assertions enabled: '%s'\n", enableAssertBuf); opt.optionString = enableAssertBuf; mOptions.add(opt); } else { @@ -712,7 +712,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) } if (jniOptsBuf[10] != '\0') { - LOGI("JNI options: '%s'\n", jniOptsBuf); + ALOGI("JNI options: '%s'\n", jniOptsBuf); opt.optionString = jniOptsBuf; mOptions.add(opt); } @@ -943,7 +943,7 @@ static int javaAttachThread(const char* threadName, JNIEnv** pEnv) result = vm->AttachCurrentThread(pEnv, (void*) &args); if (result != JNI_OK) - LOGI("NOTE: attach of thread '%s' failed\n", threadName); + ALOGI("NOTE: attach of thread '%s' failed\n", threadName); return result; } diff --git a/core/jni/android/graphics/NinePatchImpl.cpp b/core/jni/android/graphics/NinePatchImpl.cpp index 7aaca8a..1d0bb50 100644 --- a/core/jni/android/graphics/NinePatchImpl.cpp +++ b/core/jni/android/graphics/NinePatchImpl.cpp @@ -297,7 +297,7 @@ void NinePatch_Draw(SkCanvas* canvas, const SkRect& bounds, } SkIRect idst; dst.round(&idst); - //LOGI("Adding trans rect: (%d,%d)-(%d,%d)\n", + //ALOGI("Adding trans rect: (%d,%d)-(%d,%d)\n", // idst.fLeft, idst.fTop, idst.fRight, idst.fBottom); (*outRegion)->op(idst, SkRegion::kUnion_Op); } diff --git a/core/jni/android/opengl/util.cpp b/core/jni/android/opengl/util.cpp index 6a049e0..93717f3 100644 --- a/core/jni/android/opengl/util.cpp +++ b/core/jni/android/opengl/util.cpp @@ -73,10 +73,10 @@ private: static void print_poly(const char* label, Poly* pPoly) { - LOGI("%s: %d verts", label, pPoly->n); + ALOGI("%s: %d verts", label, pPoly->n); for(int i = 0; i < pPoly->n; i++) { Poly_vert* pV = & pPoly->vert[i]; - LOGI("[%d] %g, %g, %g %g", i, pV->sx, pV->sy, pV->sz, pV->sw); + ALOGI("[%d] %g, %g, %g %g", i, pV->sx, pV->sy, pV->sz, pV->sw); } } #endif diff --git a/core/jni/android_bluetooth_BluetoothAudioGateway.cpp b/core/jni/android_bluetooth_BluetoothAudioGateway.cpp index 5aef2ad..3a1a13a 100755 --- a/core/jni/android_bluetooth_BluetoothAudioGateway.cpp +++ b/core/jni/android_bluetooth_BluetoothAudioGateway.cpp @@ -215,7 +215,7 @@ static int do_accept(JNIEnv* env, jobject object, int ag_fd, get_bdaddr_as_string(&raddr.rc_bdaddr, addr); env->SetObjectField(object, out_address, env->NewStringUTF(addr)); - LOGI("Successful accept() on AG socket %d: new socket %d, address %s, RFCOMM channel %d", + ALOGI("Successful accept() on AG socket %d: new socket %d, address %s, RFCOMM channel %d", ag_fd, nsk, addr, @@ -240,7 +240,7 @@ static inline int on_accept_set_fields(JNIEnv* env, jobject object, out_fd, out_address, out_channel); } else { - LOGI("fd = %d, FD_ISSET() = %d", + ALOGI("fd = %d, FD_ISSET() = %d", ag_fd, FD_ISSET(ag_fd, &rset)); if (ag_fd >= 0 && !FD_ISSET(ag_fd, &rset)) { @@ -265,7 +265,7 @@ static jboolean waitForHandsfreeConnectNative(JNIEnv* env, jobject object, native_data_t *nat = get_native_data(env, object); #if USE_ACCEPT_DIRECTLY if (nat->hf_ag_rfcomm_channel > 0) { - LOGI("Setting HF AG server socket to RFCOMM port %d!", + ALOGI("Setting HF AG server socket to RFCOMM port %d!", nat->hf_ag_rfcomm_channel); struct timeval tv; int len = sizeof(tv); @@ -277,7 +277,7 @@ static jboolean waitForHandsfreeConnectNative(JNIEnv* env, jobject object, errno); return JNI_FALSE; } - LOGI("Current HF AG server socket RCVTIMEO is (%d(s), %d(us))!", + ALOGI("Current HF AG server socket RCVTIMEO is (%d(s), %d(us))!", (int)tv.tv_sec, (int)tv.tv_usec); if (timeout_ms >= 0) { tv.tv_sec = timeout_ms / 1000; @@ -290,7 +290,7 @@ static jboolean waitForHandsfreeConnectNative(JNIEnv* env, jobject object, errno); return JNI_FALSE; } - LOGI("Changed HF AG server socket RCVTIMEO to (%d(s), %d(us))!", + ALOGI("Changed HF AG server socket RCVTIMEO to (%d(s), %d(us))!", (int)tv.tv_sec, (int)tv.tv_usec); } @@ -310,13 +310,13 @@ static jboolean waitForHandsfreeConnectNative(JNIEnv* env, jobject object, FD_ZERO(&rset); int cnt = 0; if (nat->hf_ag_rfcomm_channel > 0) { - LOGI("Setting HF AG server socket to RFCOMM port %d!", + ALOGI("Setting HF AG server socket to RFCOMM port %d!", nat->hf_ag_rfcomm_channel); cnt++; FD_SET(nat->hf_ag_rfcomm_sock, &rset); } if (nat->hs_ag_rfcomm_channel > 0) { - LOGI("Setting HS AG server socket to RFCOMM port %d!", + ALOGI("Setting HS AG server socket to RFCOMM port %d!", nat->hs_ag_rfcomm_channel); cnt++; FD_SET(nat->hs_ag_rfcomm_sock, &rset); @@ -339,12 +339,12 @@ static jboolean waitForHandsfreeConnectNative(JNIEnv* env, jobject object, (timeout_ms < 0 ? NULL : &to)); if (timeout_ms > 0) { jint remaining = to.tv_sec*1000 + to.tv_usec/1000; - LOGI("Remaining time %ldms", (long)remaining); + ALOGI("Remaining time %ldms", (long)remaining); env->SetIntField(object, field_mTimeoutRemainingMs, remaining); } - LOGI("listening select() returned %d", n); + ALOGI("listening select() returned %d", n); if (n <= 0) { if (n < 0) { @@ -372,7 +372,7 @@ static jboolean waitForHandsfreeConnectNative(JNIEnv* env, jobject object, struct pollfd fds[2]; int cnt = 0; if (nat->hf_ag_rfcomm_channel > 0) { -// LOGI("Setting HF AG server socket %d to RFCOMM port %d!", +// ALOGI("Setting HF AG server socket %d to RFCOMM port %d!", // nat->hf_ag_rfcomm_sock, // nat->hf_ag_rfcomm_channel); fds[cnt].fd = nat->hf_ag_rfcomm_sock; @@ -380,7 +380,7 @@ static jboolean waitForHandsfreeConnectNative(JNIEnv* env, jobject object, cnt++; } if (nat->hs_ag_rfcomm_channel > 0) { -// LOGI("Setting HS AG server socket %d to RFCOMM port %d!", +// ALOGI("Setting HS AG server socket %d to RFCOMM port %d!", // nat->hs_ag_rfcomm_sock, // nat->hs_ag_rfcomm_channel); fds[cnt].fd = nat->hs_ag_rfcomm_sock; @@ -400,18 +400,18 @@ static jboolean waitForHandsfreeConnectNative(JNIEnv* env, jobject object, } else { env->SetIntField(object, field_mTimeoutRemainingMs, 0); -// LOGI("listening poll() on RFCOMM socket timed out"); +// ALOGI("listening poll() on RFCOMM socket timed out"); } return JNI_FALSE; } - //LOGI("listening poll() on RFCOMM socket returned %d", n); + //ALOGI("listening poll() on RFCOMM socket returned %d", n); int err = 0; for (cnt = 0; cnt < (int)(sizeof(fds)/sizeof(fds[0])); cnt++) { - //LOGI("Poll on fd %d revent = %d.", fds[cnt].fd, fds[cnt].revents); + //ALOGI("Poll on fd %d revent = %d.", fds[cnt].fd, fds[cnt].revents); if (fds[cnt].fd == nat->hf_ag_rfcomm_sock) { if (fds[cnt].revents & (POLLIN | POLLPRI | POLLOUT)) { - LOGI("Accepting HF connection.\n"); + ALOGI("Accepting HF connection.\n"); err += do_accept(env, object, fds[cnt].fd, field_mConnectingHandsfreeSocketFd, field_mConnectingHandsfreeAddress, @@ -421,7 +421,7 @@ static jboolean waitForHandsfreeConnectNative(JNIEnv* env, jobject object, } else if (fds[cnt].fd == nat->hs_ag_rfcomm_sock) { if (fds[cnt].revents & (POLLIN | POLLPRI | POLLOUT)) { - LOGI("Accepting HS connection.\n"); + ALOGI("Accepting HS connection.\n"); err += do_accept(env, object, fds[cnt].fd, field_mConnectingHeadsetSocketFd, field_mConnectingHeadsetAddress, @@ -432,7 +432,7 @@ static jboolean waitForHandsfreeConnectNative(JNIEnv* env, jobject object, } /* for */ if (n != 0) { - LOGI("Bogus poll(): %d fake pollfd entrie(s)!", n); + ALOGI("Bogus poll(): %d fake pollfd entrie(s)!", n); return JNI_FALSE; } diff --git a/core/jni/android_bluetooth_HeadsetBase.cpp b/core/jni/android_bluetooth_HeadsetBase.cpp index 71697a7..8dd3116 100644 --- a/core/jni/android_bluetooth_HeadsetBase.cpp +++ b/core/jni/android_bluetooth_HeadsetBase.cpp @@ -143,7 +143,7 @@ again: if (rc < 0) { if (errno == EBUSY) { - LOGI("read() error %s (%d): repeating read()...", + ALOGI("read() error %s (%d): repeating read()...", strerror(errno), errno); goto again; } @@ -208,7 +208,7 @@ static void initializeNativeDataNative(JNIEnv* env, jobject object, nat->rfcomm_sock = socketFd; nat->rfcomm_connected = socketFd >= 0; if (nat->rfcomm_connected) - LOGI("%s: ALREADY CONNECTED!", __FUNCTION__); + ALOGI("%s: ALREADY CONNECTED!", __FUNCTION__); #endif } @@ -310,7 +310,7 @@ static jint connectAsyncNative(JNIEnv *env, jobject obj) { close(nat->rfcomm_sock); return -1; } - LOGI("Created RFCOMM socket fd %d.", nat->rfcomm_sock); + ALOGI("Created RFCOMM socket fd %d.", nat->rfcomm_sock); } memset(&addr, 0, sizeof(struct sockaddr_rc)); @@ -330,13 +330,13 @@ static jint connectAsyncNative(JNIEnv *env, jobject obj) { if (rc >= 0) { nat->rfcomm_connected = 1; - LOGI("async connect successful"); + ALOGI("async connect successful"); return 0; } else if (rc < 0) { if (errno == EINPROGRESS || errno == EAGAIN) { - LOGI("async connect is in progress (%s)", + ALOGI("async connect is in progress (%s)", strerror(errno)); nat->rfcomm_connected = -1; return 0; @@ -365,19 +365,19 @@ static jint waitForAsyncConnectNative(JNIEnv *env, jobject obj, env->SetIntField(obj, field_mTimeoutRemainingMs, timeout_ms); if (nat->rfcomm_connected > 0) { - LOGI("RFCOMM is already connected!"); + ALOGI("RFCOMM is already connected!"); return 1; } if (nat->rfcomm_sock >= 0 && nat->rfcomm_connected == 0) { - LOGI("Re-opening RFCOMM socket."); + ALOGI("Re-opening RFCOMM socket."); close(nat->rfcomm_sock); nat->rfcomm_sock = -1; } int ret = connectAsyncNative(env, obj); if (ret < 0) { - LOGI("Failed to re-open RFCOMM socket!"); + ALOGI("Failed to re-open RFCOMM socket!"); return ret; } @@ -451,7 +451,7 @@ static jint waitForAsyncConnectNative(JNIEnv *env, jobject obj, } /* Restore the blocking properties of the socket. */ fcntl(nat->rfcomm_sock, F_SETFL, nat->rfcomm_sock_flags); - LOGI("Successful RFCOMM socket connect."); + ALOGI("Successful RFCOMM socket connect."); nat->rfcomm_connected = 1; return 1; } diff --git a/core/jni/android_database_SQLiteDatabase.cpp b/core/jni/android_database_SQLiteDatabase.cpp index 2966a71..cf4cbb8 100644 --- a/core/jni/android_database_SQLiteDatabase.cpp +++ b/core/jni/android_database_SQLiteDatabase.cpp @@ -79,7 +79,7 @@ static void sqlLogger(void *databaseName, int iErrCode, const char *zMsg) { // skip printing this message if it is due to certain types of errors if (iErrCode == 0 || iErrCode == SQLITE_CONSTRAINT) return; // print databasename, errorcode and msg - LOGI("sqlite returned: error code = %d, msg = %s, db=%s\n", iErrCode, zMsg, databaseName); + ALOGI("sqlite returned: error code = %d, msg = %s, db=%s\n", iErrCode, zMsg, databaseName); } // register the logging func on sqlite. needs to be done BEFORE any sqlite3 func is called. @@ -197,7 +197,7 @@ static char *getDatabaseName(JNIEnv* env, sqlite3 * handle, jstring databaseName } static void sqlTrace(void *databaseName, const char *sql) { - LOGI("sql_statement|%s|%s\n", (char *)databaseName, sql); + ALOGI("sql_statement|%s|%s\n", (char *)databaseName, sql); } /* public native void enableSqlTracing(); */ @@ -209,7 +209,7 @@ static void enableSqlTracing(JNIEnv* env, jobject object, jstring databaseName, static void sqlProfile(void *databaseName, const char *sql, sqlite3_uint64 tm) { double d = tm/1000000.0; - LOGI("elapsedTime4Sql|%s|%.3f ms|%s\n", (char *)databaseName, d, sql); + ALOGI("elapsedTime4Sql|%s|%.3f ms|%s\n", (char *)databaseName, d, sql); } /* public native void enableSqlProfiling(); */ diff --git a/core/jni/android_debug_JNITest.cpp b/core/jni/android_debug_JNITest.cpp index f14201e..e0f61fb 100644 --- a/core/jni/android_debug_JNITest.cpp +++ b/core/jni/android_debug_JNITest.cpp @@ -39,7 +39,7 @@ static jint android_debug_JNITest_part1(JNIEnv* env, jobject object, jint arrayVal; int result = -2; - LOGI("JNI test: in part1, intArg=%d, doubleArg=%.3f\n", intArg, doubleArg); + ALOGI("JNI test: in part1, intArg=%d, doubleArg=%.3f\n", intArg, doubleArg); /* find "int part2(double doubleArg, int fromArray, String stringArg)" */ clazz = env->GetObjectClass(object); @@ -52,7 +52,7 @@ static jint android_debug_JNITest_part1(JNIEnv* env, jobject object, /* get the length of the array */ arrayLen = env->GetArrayLength(arrayArg); - LOGI(" array size is %d\n", arrayLen); + ALOGI(" array size is %d\n", arrayLen); /* * Get the last element in the array. @@ -60,7 +60,7 @@ static jint android_debug_JNITest_part1(JNIEnv* env, jobject object, * to multiple elements. */ arrayVal = (int) env->GetObjectArrayElement(arrayArg, arrayLen-1); - LOGI(" array val is %d\n", arrayVal); + ALOGI(" array val is %d\n", arrayVal); /* call this->part2 */ result = env->CallIntMethod(object, part2id, @@ -79,11 +79,11 @@ static jint android_debug_JNITest_part3(JNIEnv* env, jclass clazz, const char* utfChars; jboolean isCopy; - LOGI("JNI test: in part3\n"); + ALOGI("JNI test: in part3\n"); utfChars = env->GetStringUTFChars(stringArg, &isCopy); - LOGI(" String is '%s', isCopy=%d\n", (const char*) utfChars, isCopy); + ALOGI(" String is '%s', isCopy=%d\n", (const char*) utfChars, isCopy); env->ReleaseStringUTFChars(stringArg, utfChars); diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp index f8dc618..d9908ce 100644 --- a/core/jni/android_os_Debug.cpp +++ b/core/jni/android_os_Debug.cpp @@ -184,7 +184,7 @@ static void read_mapinfo(FILE *fp, stats_t* stats) } } - //LOGI("native=%d dalvik=%d sqlite=%d: %s\n", isNativeHeap, isDalvikHeap, + //ALOGI("native=%d dalvik=%d sqlite=%d: %s\n", isNativeHeap, isDalvikHeap, // isSqliteHeap, line); while (true) { diff --git a/core/jni/android_server_BluetoothEventLoop.cpp b/core/jni/android_server_BluetoothEventLoop.cpp index 100fca4..d146e27 100644 --- a/core/jni/android_server_BluetoothEventLoop.cpp +++ b/core/jni/android_server_BluetoothEventLoop.cpp @@ -1097,7 +1097,7 @@ DBusHandlerResult agent_event_filter(DBusConnection *conn, ALOGV("%s: not interested (not a method call).", __FUNCTION__); return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } - LOGI("%s: Received method %s:%s", __FUNCTION__, + ALOGI("%s: Received method %s:%s", __FUNCTION__, dbus_message_get_interface(msg), dbus_message_get_member(msg)); if (nat == NULL) return DBUS_HANDLER_RESULT_HANDLED; diff --git a/core/jni/android_server_Watchdog.cpp b/core/jni/android_server_Watchdog.cpp index 9e0ed47..cf52833 100644 --- a/core/jni/android_server_Watchdog.cpp +++ b/core/jni/android_server_Watchdog.cpp @@ -56,7 +56,7 @@ static void dumpKernelStacks(JNIEnv* env, jobject clazz, jstring pathStr) { char buf[128]; DIR* taskdir; - LOGI("dumpKernelStacks"); + ALOGI("dumpKernelStacks"); if (!pathStr) { jniThrowException(env, "java/lang/IllegalArgumentException", "Null path"); return; diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp index 9e3d04a..b2ecf62 100644 --- a/core/jni/android_util_Binder.cpp +++ b/core/jni/android_util_Binder.cpp @@ -476,7 +476,7 @@ public: protected: virtual ~JavaDeathRecipient() { - //LOGI("Removing death ref: recipient=%p\n", mObject); + //ALOGI("Removing death ref: recipient=%p\n", mObject); android_atomic_dec(&gNumDeathRefs); JNIEnv* env = javavm_to_jnienv(mVM); if (mObject != NULL) { @@ -1635,7 +1635,7 @@ static void android_os_Parcel_closeFileDescriptor(JNIEnv* env, jobject clazz, jo int fd = jniGetFDFromFileDescriptor(env, object); if (fd >= 0) { jniSetFileDescriptorOfFD(env, object, -1); - //LOGI("Closing ParcelFileDescriptor %d\n", fd); + //ALOGI("Closing ParcelFileDescriptor %d\n", fd); close(fd); } } @@ -1658,7 +1658,7 @@ static void android_os_Parcel_freeBuffer(JNIEnv* env, jobject clazz) if (own) { Parcel* parcel = parcelForJavaObject(env, clazz); if (parcel != NULL) { - //LOGI("Parcel.freeBuffer() called for C++ Parcel %p\n", parcel); + //ALOGI("Parcel.freeBuffer() called for C++ Parcel %p\n", parcel); parcel->freeData(); } } @@ -1669,17 +1669,17 @@ static void android_os_Parcel_init(JNIEnv* env, jobject clazz, jint parcelInt) Parcel* parcel = (Parcel*)parcelInt; int own = 0; if (!parcel) { - //LOGI("Initializing obj %p: creating new Parcel\n", clazz); + //ALOGI("Initializing obj %p: creating new Parcel\n", clazz); own = 1; parcel = new Parcel; } else { - //LOGI("Initializing obj %p: given existing Parcel %p\n", clazz, parcel); + //ALOGI("Initializing obj %p: given existing Parcel %p\n", clazz, parcel); } if (parcel == NULL) { jniThrowException(env, "java/lang/OutOfMemoryError", NULL); return; } - //LOGI("Initializing obj %p from C++ Parcel %p, own=%d\n", clazz, parcel, own); + //ALOGI("Initializing obj %p from C++ Parcel %p, own=%d\n", clazz, parcel, own); env->SetIntField(clazz, gParcelOffsets.mOwnObject, own); env->SetIntField(clazz, gParcelOffsets.mObject, (int)parcel); } @@ -1690,11 +1690,11 @@ static void android_os_Parcel_destroy(JNIEnv* env, jobject clazz) if (own) { Parcel* parcel = parcelForJavaObject(env, clazz); env->SetIntField(clazz, gParcelOffsets.mObject, 0); - //LOGI("Destroying obj %p: deleting C++ Parcel %p\n", clazz, parcel); + //ALOGI("Destroying obj %p: deleting C++ Parcel %p\n", clazz, parcel); delete parcel; } else { env->SetIntField(clazz, gParcelOffsets.mObject, 0); - //LOGI("Destroying obj %p: leaving C++ Parcel %p\n", clazz); + //ALOGI("Destroying obj %p: leaving C++ Parcel %p\n", clazz); } } diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp index bc7e47c..8660668 100644 --- a/core/jni/android_util_Process.cpp +++ b/core/jni/android_util_Process.cpp @@ -291,7 +291,7 @@ void android_os_Process_setThreadPriority(JNIEnv* env, jobject clazz, } } - //LOGI("Setting priority of %d: %d, getpriority returns %d\n", + //ALOGI("Setting priority of %d: %d, getpriority returns %d\n", // pid, pri, getpriority(PRIO_PROCESS, pid)); } @@ -310,7 +310,7 @@ jint android_os_Process_getThreadPriority(JNIEnv* env, jobject clazz, if (errno != 0) { signalExceptionForPriorityError(env, clazz, errno); } - //LOGI("Returning priority of %d: %d\n", pid, pri); + //ALOGI("Returning priority of %d: %d\n", pid, pri); return pri; } @@ -362,7 +362,7 @@ jint android_os_Process_setGid(JNIEnv* env, jobject clazz, jint uid) static int pid_compare(const void* v1, const void* v2) { - //LOGI("Compare %d vs %d\n", *((const jint*)v1), *((const jint*)v2)); + //ALOGI("Compare %d vs %d\n", *((const jint*)v1), *((const jint*)v2)); return *((const jint*)v1) - *((const jint*)v2); } @@ -420,7 +420,7 @@ static jlong android_os_Process_getFreeMemory(JNIEnv* env, jobject clazz) void android_os_Process_readProcLines(JNIEnv* env, jobject clazz, jstring fileStr, jobjectArray reqFields, jlongArray outFields) { - //LOGI("getMemInfo: %p %p", reqFields, outFields); + //ALOGI("getMemInfo: %p %p", reqFields, outFields); if (fileStr == NULL || reqFields == NULL || outFields == NULL) { jniThrowNullPointerException(env, NULL); @@ -447,7 +447,7 @@ void android_os_Process_readProcLines(JNIEnv* env, jobject clazz, jstring fileSt jobject obj = env->GetObjectArrayElement(reqFields, i); if (obj != NULL) { const char* str8 = env->GetStringUTFChars((jstring)obj, NULL); - //LOGI("String at %d: %p = %s", i, obj, str8); + //ALOGI("String at %d: %p = %s", i, obj, str8); if (str8 == NULL) { jniThrowNullPointerException(env, "Element in reqFields"); return; @@ -465,7 +465,7 @@ void android_os_Process_readProcLines(JNIEnv* env, jobject clazz, jstring fileSt return; } - //LOGI("Clearing %d sizes", count); + //ALOGI("Clearing %d sizes", count); for (i=0; i<count; i++) { sizesArray[i] = 0; } @@ -489,7 +489,7 @@ void android_os_Process_readProcLines(JNIEnv* env, jobject clazz, jstring fileSt char* p = buffer; while (*p && foundCount < count) { bool skipToEol = true; - //LOGI("Parsing at: %s", p); + //ALOGI("Parsing at: %s", p); for (i=0; i<count; i++) { const String8& field = fields[i]; if (strncmp(p, field.string(), field.length()) == 0) { @@ -504,7 +504,7 @@ void android_os_Process_readProcLines(JNIEnv* env, jobject clazz, jstring fileSt } char* end; sizesArray[i] = strtoll(num, &end, 10); - //LOGI("Field %s = %d", field.string(), sizesArray[i]); + //ALOGI("Field %s = %d", field.string(), sizesArray[i]); foundCount++; break; } @@ -524,7 +524,7 @@ void android_os_Process_readProcLines(JNIEnv* env, jobject clazz, jstring fileSt LOGW("Unable to open %s", file.string()); } - //LOGI("Done!"); + //ALOGI("Done!"); env->ReleaseLongArrayElements(outFields, sizesArray, 0); } @@ -570,7 +570,7 @@ jintArray android_os_Process_getPids(JNIEnv* env, jobject clazz, char* end; int pid = strtol(entry->d_name, &end, 10); - //LOGI("File %s pid=%d\n", entry->d_name, pid); + //ALOGI("File %s pid=%d\n", entry->d_name, pid); if (curPos >= curCount) { jsize newCount = (curCount == 0) ? 10 : (curCount*2); jintArray newArray = env->NewIntArray(newCount); @@ -693,7 +693,7 @@ jboolean android_os_Process_parseProcLineArray(JNIEnv* env, jobject clazz, } } - //LOGI("Field %d: %d-%d dest=%d mode=0x%x\n", i, start, end, di, mode); + //ALOGI("Field %d: %d-%d dest=%d mode=0x%x\n", i, start, end, di, mode); if ((mode&(PROC_OUT_FLOAT|PROC_OUT_LONG|PROC_OUT_STRING)) != 0) { char c = buffer[end]; @@ -792,7 +792,7 @@ void android_os_Process_setApplicationObject(JNIEnv* env, jobject clazz, void android_os_Process_sendSignal(JNIEnv* env, jobject clazz, jint pid, jint sig) { if (pid > 0) { - LOGI("Sending signal. PID: %d SIG: %d", pid, sig); + ALOGI("Sending signal. PID: %d SIG: %d", pid, sig); kill(pid, sig); } } diff --git a/core/jni/android_view_InputQueue.cpp b/core/jni/android_view_InputQueue.cpp index d44dbc0..adf81b4 100644 --- a/core/jni/android_view_InputQueue.cpp +++ b/core/jni/android_view_InputQueue.cpp @@ -207,7 +207,7 @@ status_t NativeInputQueue::unregisterInputChannel(JNIEnv* env, jobject inputChan connection->inputHandlerObjGlobal = NULL; if (connection->messageInProgress) { - LOGI("Sending finished signal for input channel '%s' since it is being unregistered " + ALOGI("Sending finished signal for input channel '%s' since it is being unregistered " "while an input message is still in progress.", connection->getInputChannelName()); connection->messageInProgress = false; @@ -244,7 +244,7 @@ status_t NativeInputQueue::finished(JNIEnv* env, jlong finishedToken, ssize_t connectionIndex = mConnectionsByReceiveFd.indexOfKey(receiveFd); if (connectionIndex < 0) { if (! ignoreSpuriousFinish) { - LOGI("Ignoring finish signal on channel that is no longer registered."); + ALOGI("Ignoring finish signal on channel that is no longer registered."); } return DEAD_OBJECT; } @@ -252,7 +252,7 @@ status_t NativeInputQueue::finished(JNIEnv* env, jlong finishedToken, sp<Connection> connection = mConnectionsByReceiveFd.valueAt(connectionIndex); if (connectionId != connection->id) { if (! ignoreSpuriousFinish) { - LOGI("Ignoring finish signal on channel that is no longer registered."); + ALOGI("Ignoring finish signal on channel that is no longer registered."); } return DEAD_OBJECT; } diff --git a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp index 62ea277..79be2b2 100644 --- a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp +++ b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp @@ -216,18 +216,18 @@ copyFileIfChanged(JNIEnv *env, void* arg, ZipFileRO* zipFile, ZipEntryRO zipEntr if (strlcpy(localTmpFileName + nativeLibPath.size(), TMP_FILE_PATTERN, TMP_FILE_PATTERN_LEN - nativeLibPath.size()) != TMP_FILE_PATTERN_LEN) { - LOGI("Couldn't allocate temporary file name for library"); + ALOGI("Couldn't allocate temporary file name for library"); return INSTALL_FAILED_INTERNAL_ERROR; } int fd = mkstemp(localTmpFileName); if (fd < 0) { - LOGI("Couldn't open temporary file name: %s: %s\n", localTmpFileName, strerror(errno)); + ALOGI("Couldn't open temporary file name: %s: %s\n", localTmpFileName, strerror(errno)); return INSTALL_FAILED_CONTAINER_ERROR; } if (!zipFile->uncompressEntry(zipEntry, fd)) { - LOGI("Failed uncompressing %s to %s\n", fileName, localTmpFileName); + ALOGI("Failed uncompressing %s to %s\n", fileName, localTmpFileName); close(fd); unlink(localTmpFileName); return INSTALL_FAILED_CONTAINER_ERROR; @@ -241,7 +241,7 @@ copyFileIfChanged(JNIEnv *env, void* arg, ZipFileRO* zipFile, ZipEntryRO zipEntr times[1].tv_sec = modTime; times[0].tv_usec = times[1].tv_usec = 0; if (utimes(localTmpFileName, times) < 0) { - LOGI("Couldn't change modification time on %s: %s\n", localTmpFileName, strerror(errno)); + ALOGI("Couldn't change modification time on %s: %s\n", localTmpFileName, strerror(errno)); unlink(localTmpFileName); return INSTALL_FAILED_CONTAINER_ERROR; } @@ -249,14 +249,14 @@ copyFileIfChanged(JNIEnv *env, void* arg, ZipFileRO* zipFile, ZipEntryRO zipEntr // Set the mode to 755 static const mode_t mode = S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH; if (chmod(localTmpFileName, mode) < 0) { - LOGI("Couldn't change permissions on %s: %s\n", localTmpFileName, strerror(errno)); + ALOGI("Couldn't change permissions on %s: %s\n", localTmpFileName, strerror(errno)); unlink(localTmpFileName); return INSTALL_FAILED_CONTAINER_ERROR; } // Finally, rename it to the final name. if (rename(localTmpFileName, localFileName) < 0) { - LOGI("Couldn't rename %s to %s: %s\n", localTmpFileName, localFileName, strerror(errno)); + ALOGI("Couldn't rename %s to %s: %s\n", localTmpFileName, localFileName, strerror(errno)); unlink(localTmpFileName); return INSTALL_FAILED_CONTAINER_ERROR; } @@ -276,7 +276,7 @@ iterateOverNativeFiles(JNIEnv *env, jstring javaFilePath, jstring javaCpuAbi, js ZipFileRO zipFile; if (zipFile.open(filePath.c_str()) != NO_ERROR) { - LOGI("Couldn't open APK %s\n", filePath.c_str()); + ALOGI("Couldn't open APK %s\n", filePath.c_str()); return INSTALL_FAILED_INVALID_APK; } diff --git a/drm/drmserver/main_drmserver.cpp b/drm/drmserver/main_drmserver.cpp index 6d10646..ed42818 100644 --- a/drm/drmserver/main_drmserver.cpp +++ b/drm/drmserver/main_drmserver.cpp @@ -32,7 +32,7 @@ int main(int argc, char** argv) { sp<ProcessState> proc(ProcessState::self()); sp<IServiceManager> sm = defaultServiceManager(); - LOGI("ServiceManager: %p", sm.get()); + ALOGI("ServiceManager: %p", sm.get()); DrmManagerService::instantiate(); ProcessState::self()->startThreadPool(); IPCThreadState::self()->joinThreadPool(); diff --git a/include/utils/ResourceTypes.h b/include/utils/ResourceTypes.h index 612ff93..71e5324 100644 --- a/include/utils/ResourceTypes.h +++ b/include/utils/ResourceTypes.h @@ -1277,7 +1277,7 @@ struct ResTable_config myDelta += requested->screenHeightDp - screenHeightDp; otherDelta += requested->screenHeightDp - o.screenHeightDp; } - //LOGI("Comparing this %dx%d to other %dx%d in %dx%d: myDelta=%d otherDelta=%d", + //ALOGI("Comparing this %dx%d to other %dx%d in %dx%d: myDelta=%d otherDelta=%d", // screenWidthDp, screenHeightDp, o.screenWidthDp, o.screenHeightDp, // requested->screenWidthDp, requested->screenHeightDp, myDelta, otherDelta); return (myDelta <= otherDelta); @@ -1506,11 +1506,11 @@ struct ResTable_config } if (screenSizeDp != 0) { if (screenWidthDp != 0 && screenWidthDp > settings.screenWidthDp) { - //LOGI("Filtering out width %d in requested %d", screenWidthDp, settings.screenWidthDp); + //ALOGI("Filtering out width %d in requested %d", screenWidthDp, settings.screenWidthDp); return false; } if (screenHeightDp != 0 && screenHeightDp > settings.screenHeightDp) { - //LOGI("Filtering out height %d in requested %d", screenHeightDp, settings.screenHeightDp); + //ALOGI("Filtering out height %d in requested %d", screenHeightDp, settings.screenHeightDp); return false; } } @@ -1530,9 +1530,9 @@ struct ResTable_config // For compatibility, we count a request for KEYSHIDDEN_NO as also // matching the more recent KEYSHIDDEN_SOFT. Basically // KEYSHIDDEN_NO means there is some kind of keyboard available. - //LOGI("Matching keysHidden: have=%d, config=%d\n", keysHidden, setKeysHidden); + //ALOGI("Matching keysHidden: have=%d, config=%d\n", keysHidden, setKeysHidden); if (keysHidden != KEYSHIDDEN_NO || setKeysHidden != KEYSHIDDEN_SOFT) { - //LOGI("No match!"); + //ALOGI("No match!"); return false; } } diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp index 641134a..a42c336 100644 --- a/libs/binder/IPCThreadState.cpp +++ b/libs/binder/IPCThreadState.cpp @@ -493,7 +493,7 @@ void IPCThreadState::joinThreadPool(bool isMain) void IPCThreadState::stopProcess(bool immediate) { - //LOGI("**** STOPPING PROCESS"); + //ALOGI("**** STOPPING PROCESS"); flushCommands(); int fd = mProcess->mDriverFD; mProcess->mDriverFD = -1; @@ -530,9 +530,9 @@ status_t IPCThreadState::transact(int32_t handle, if ((flags & TF_ONE_WAY) == 0) { #if 0 if (code == 4) { // relayout - LOGI(">>>>>> CALLING transaction 4"); + ALOGI(">>>>>> CALLING transaction 4"); } else { - LOGI(">>>>>> CALLING transaction %d", code); + ALOGI(">>>>>> CALLING transaction %d", code); } #endif if (reply) { @@ -543,9 +543,9 @@ status_t IPCThreadState::transact(int32_t handle, } #if 0 if (code == 4) { // relayout - LOGI("<<<<<< RETURNING transaction 4"); + ALOGI("<<<<<< RETURNING transaction 4"); } else { - LOGI("<<<<<< RETURNING transaction %d", code); + ALOGI("<<<<<< RETURNING transaction %d", code); } #endif @@ -1009,7 +1009,7 @@ status_t IPCThreadState::executeCommand(int32_t cmd) } } - //LOGI(">>>> TRANSACT from pid %d uid %d\n", mCallingPid, mCallingUid); + //ALOGI(">>>> TRANSACT from pid %d uid %d\n", mCallingPid, mCallingUid); Parcel reply; IF_LOG_TRANSACTIONS() { @@ -1033,7 +1033,7 @@ status_t IPCThreadState::executeCommand(int32_t cmd) if (error < NO_ERROR) reply.setError(error); } - //LOGI("<<<< TRANSACT from pid %d restore pid %d uid %d\n", + //ALOGI("<<<< TRANSACT from pid %d restore pid %d uid %d\n", // mCallingPid, origPid, origUid); if ((tr.flags & TF_ONE_WAY) == 0) { @@ -1110,7 +1110,7 @@ void IPCThreadState::freeBuffer(Parcel* parcel, const uint8_t* data, size_t data const size_t* objects, size_t objectsSize, void* cookie) { - //LOGI("Freeing parcel %p", &parcel); + //ALOGI("Freeing parcel %p", &parcel); IF_LOG_COMMANDS() { alog << "Writing BC_FREE_BUFFER for " << data << endl; } diff --git a/libs/binder/IServiceManager.cpp b/libs/binder/IServiceManager.cpp index 1fa4c35..1c1b546 100644 --- a/libs/binder/IServiceManager.cpp +++ b/libs/binder/IServiceManager.cpp @@ -78,7 +78,7 @@ bool checkPermission(const String16& permission, pid_t pid, uid_t uid) bool res = pc->checkPermission(permission, pid, uid); if (res) { if (startTime != 0) { - LOGI("Check passed after %d seconds for %s from uid=%d pid=%d", + ALOGI("Check passed after %d seconds for %s from uid=%d pid=%d", (int)((uptimeMillis()-startTime)/1000), String8(permission).string(), uid, pid); } @@ -106,7 +106,7 @@ bool checkPermission(const String16& permission, pid_t pid, uid_t uid) // Wait for the permission controller to come back... if (startTime == 0) { startTime = uptimeMillis(); - LOGI("Waiting to check permission %s from uid=%d pid=%d", + ALOGI("Waiting to check permission %s from uid=%d pid=%d", String8(permission).string(), uid, pid); } sleep(1); @@ -136,7 +136,7 @@ public: for (n = 0; n < 5; n++){ sp<IBinder> svc = checkService(name); if (svc != NULL) return svc; - LOGI("Waiting for service %s...\n", String8(name).string()); + ALOGI("Waiting for service %s...\n", String8(name).string()); sleep(1); } return NULL; diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index d987178..8b9db7f 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -1088,7 +1088,7 @@ int Parcel::readFileDescriptor() const if (flat) { switch (flat->type) { case BINDER_TYPE_FD: - //LOGI("Returning file descriptor %ld from parcel %p\n", flat->handle, this); + //ALOGI("Returning file descriptor %ld from parcel %p\n", flat->handle, this); return flat->handle; } } @@ -1218,14 +1218,14 @@ void Parcel::closeFileDescriptors() { size_t i = mObjectsSize; if (i > 0) { - //LOGI("Closing file descriptors for %d objects...", mObjectsSize); + //ALOGI("Closing file descriptors for %d objects...", mObjectsSize); } while (i > 0) { i--; const flat_binder_object* flat = reinterpret_cast<flat_binder_object*>(mData+mObjects[i]); if (flat->type == BINDER_TYPE_FD) { - //LOGI("Closing fd: %ld\n", flat->handle); + //ALOGI("Closing fd: %ld\n", flat->handle); close(flat->handle); } } @@ -1258,7 +1258,7 @@ void Parcel::ipcSetDataReference(const uint8_t* data, size_t dataSize, mError = NO_ERROR; mData = const_cast<uint8_t*>(data); mDataSize = mDataCapacity = dataSize; - //LOGI("setDataReference Setting data size of %p to %lu (pid=%d)\n", this, mDataSize, getpid()); + //ALOGI("setDataReference Setting data size of %p to %lu (pid=%d)\n", this, mDataSize, getpid()); mDataPos = 0; ALOGV("setDataReference Setting data pos of %p to %d\n", this, mDataPos); mObjects = const_cast<size_t*>(objects); @@ -1332,7 +1332,7 @@ void Parcel::freeData() void Parcel::freeDataNoInit() { if (mOwner) { - //LOGI("Freeing data ref of %p (pid=%d)\n", this, getpid()); + //ALOGI("Freeing data ref of %p (pid=%d)\n", this, getpid()); mOwner(this, mData, mDataSize, mObjects, mObjectsSize, mOwnerCookie); } else { releaseObjects(); @@ -1438,7 +1438,7 @@ status_t Parcel::continueWrite(size_t desired) if (objects && mObjects) { memcpy(objects, mObjects, objectsSize*sizeof(size_t)); } - //LOGI("Freeing data ref of %p (pid=%d)\n", this, getpid()); + //ALOGI("Freeing data ref of %p (pid=%d)\n", this, getpid()); mOwner(this, mData, mDataSize, mObjects, mObjectsSize, mOwnerCookie); mOwner = NULL; diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp index c86be7f..774e75b 100644 --- a/libs/gui/SurfaceTexture.cpp +++ b/libs/gui/SurfaceTexture.cpp @@ -62,7 +62,7 @@ // Macros for including the SurfaceTexture name in log messages #define ST_LOGV(x, ...) ALOGV("[%s] "x, mName.string(), ##__VA_ARGS__) #define ST_LOGD(x, ...) ALOGD("[%s] "x, mName.string(), ##__VA_ARGS__) -#define ST_LOGI(x, ...) LOGI("[%s] "x, mName.string(), ##__VA_ARGS__) +#define ST_LOGI(x, ...) ALOGI("[%s] "x, mName.string(), ##__VA_ARGS__) #define ST_LOGW(x, ...) LOGW("[%s] "x, mName.string(), ##__VA_ARGS__) #define ST_LOGE(x, ...) LOGE("[%s] "x, mName.string(), ##__VA_ARGS__) diff --git a/libs/utils/Asset.cpp b/libs/utils/Asset.cpp index 7c34c6a..07693bb 100644 --- a/libs/utils/Asset.cpp +++ b/libs/utils/Asset.cpp @@ -89,7 +89,7 @@ Asset::Asset(void) gTail->mNext = this; gTail = this; } - //LOGI("Creating Asset %p #%d\n", this, gCount); + //ALOGI("Creating Asset %p #%d\n", this, gCount); } Asset::~Asset(void) @@ -109,7 +109,7 @@ Asset::~Asset(void) mPrev->mNext = mNext; } mNext = mPrev = NULL; - //LOGI("Destroying Asset in %p #%d\n", this, gCount); + //ALOGI("Destroying Asset in %p #%d\n", this, gCount); } /* diff --git a/libs/utils/AssetManager.cpp b/libs/utils/AssetManager.cpp index e7c4d47..77db3d4 100644 --- a/libs/utils/AssetManager.cpp +++ b/libs/utils/AssetManager.cpp @@ -117,14 +117,14 @@ AssetManager::AssetManager(CacheMode cacheMode) mCacheMode(cacheMode), mCacheValid(false) { int count = android_atomic_inc(&gCount)+1; - //LOGI("Creating AssetManager %p #%d\n", this, count); + //ALOGI("Creating AssetManager %p #%d\n", this, count); memset(mConfig, 0, sizeof(ResTable_config)); } AssetManager::~AssetManager(void) { int count = android_atomic_dec(&gCount); - //LOGI("Destroying AssetManager in %p #%d\n", this, count); + //ALOGI("Destroying AssetManager in %p #%d\n", this, count); delete mConfig; delete mResources; @@ -1780,7 +1780,7 @@ AssetManager::SharedZip::SharedZip(const String8& path, time_t modWhen) : mPath(path), mZipFile(NULL), mModWhen(modWhen), mResourceTableAsset(NULL), mResourceTable(NULL) { - //LOGI("Creating SharedZip %p %s\n", this, (const char*)mPath); + //ALOGI("Creating SharedZip %p %s\n", this, (const char*)mPath); mZipFile = new ZipFileRO; ALOGV("+++ opening zip '%s'\n", mPath.string()); if (mZipFile->open(mPath.string()) != NO_ERROR) { @@ -1858,7 +1858,7 @@ bool AssetManager::SharedZip::isUpToDate() AssetManager::SharedZip::~SharedZip() { - //LOGI("Destroying SharedZip %p %s\n", this, (const char*)mPath); + //ALOGI("Destroying SharedZip %p %s\n", this, (const char*)mPath); if (mResourceTable != NULL) { delete mResourceTable; } diff --git a/libs/utils/BackupData.cpp b/libs/utils/BackupData.cpp index 5afe2dc..f956306 100644 --- a/libs/utils/BackupData.cpp +++ b/libs/utils/BackupData.cpp @@ -78,7 +78,7 @@ BackupDataWriter::write_padding_for(int n) paddingSize = padding_extra(n); if (paddingSize > 0) { uint32_t padding = 0xbcbcbcbc; - if (DEBUG) LOGI("writing %d padding bytes for %d", paddingSize, n); + if (DEBUG) ALOGI("writing %d padding bytes for %d", paddingSize, n); amt = write(m_fd, &padding, paddingSize); if (amt != paddingSize) { m_status = errno; @@ -125,7 +125,7 @@ BackupDataWriter::WriteEntityHeader(const String8& key, size_t dataSize) header.keyLen = tolel(keyLen); header.dataSize = tolel(dataSize); - if (DEBUG) LOGI("writing entity header, %d bytes", sizeof(entity_header_v1)); + if (DEBUG) ALOGI("writing entity header, %d bytes", sizeof(entity_header_v1)); amt = write(m_fd, &header, sizeof(entity_header_v1)); if (amt != sizeof(entity_header_v1)) { m_status = errno; @@ -133,7 +133,7 @@ BackupDataWriter::WriteEntityHeader(const String8& key, size_t dataSize) } m_pos += amt; - if (DEBUG) LOGI("writing entity header key, %d bytes", keyLen+1); + if (DEBUG) ALOGI("writing entity header key, %d bytes", keyLen+1); amt = write(m_fd, k.string(), keyLen+1); if (amt != keyLen+1) { m_status = errno; diff --git a/libs/utils/BackupHelpers.cpp b/libs/utils/BackupHelpers.cpp index aee7ff0..882bf71 100644 --- a/libs/utils/BackupHelpers.cpp +++ b/libs/utils/BackupHelpers.cpp @@ -628,7 +628,7 @@ int write_tarfile(const String8& packageName, const String8& domain, // [ 329 : 8 ] and [ 337 : 8 ] devmajor/devminor, not used - LOGI(" Name: %s", fullname.string()); + ALOGI(" Name: %s", fullname.string()); // If we're using a pax extended header, build & write that here; lengths are // already preflighted diff --git a/libs/utils/ObbFile.cpp b/libs/utils/ObbFile.cpp index 2907b56..11fe1e9 100644 --- a/libs/utils/ObbFile.cpp +++ b/libs/utils/ObbFile.cpp @@ -179,14 +179,14 @@ bool ObbFile::parseObbFile(int fd) actual = TEMP_FAILURE_RETRY(read(fd, scanBuf, footerSize)); // readAmount is guaranteed to be less than kMaxBufSize if (actual != (ssize_t)footerSize) { - LOGI("couldn't read ObbFile footer: %s\n", strerror(errno)); + ALOGI("couldn't read ObbFile footer: %s\n", strerror(errno)); free(scanBuf); return false; } #ifdef DEBUG for (int i = 0; i < footerSize; ++i) { - LOGI("char: 0x%02x\n", scanBuf[i]); + ALOGI("char: 0x%02x\n", scanBuf[i]); } #endif @@ -217,7 +217,7 @@ bool ObbFile::parseObbFile(int fd) free(scanBuf); #ifdef DEBUG - LOGI("Obb scan succeeded: packageName=%s, version=%d\n", mPackageName.string(), mVersion); + ALOGI("Obb scan succeeded: packageName=%s, version=%d\n", mPackageName.string(), mVersion); #endif return true; diff --git a/libs/utils/ResourceTypes.cpp b/libs/utils/ResourceTypes.cpp index 559afd8..3569e32 100644 --- a/libs/utils/ResourceTypes.cpp +++ b/libs/utils/ResourceTypes.cpp @@ -1164,7 +1164,7 @@ ResXMLTree::ResXMLTree() : ResXMLParser(*this) , mError(NO_INIT), mOwnedData(NULL) { - //LOGI("Creating ResXMLTree %p #%d\n", this, android_atomic_inc(&gCount)+1); + //ALOGI("Creating ResXMLTree %p #%d\n", this, android_atomic_inc(&gCount)+1); restart(); } @@ -1172,13 +1172,13 @@ ResXMLTree::ResXMLTree(const void* data, size_t size, bool copyData) : ResXMLParser(*this) , mError(NO_INIT), mOwnedData(NULL) { - //LOGI("Creating ResXMLTree %p #%d\n", this, android_atomic_inc(&gCount)+1); + //ALOGI("Creating ResXMLTree %p #%d\n", this, android_atomic_inc(&gCount)+1); setTo(data, size, copyData); } ResXMLTree::~ResXMLTree() { - //LOGI("Destroying ResXMLTree in %p #%d\n", this, android_atomic_dec(&gCount)-1); + //ALOGI("Destroying ResXMLTree in %p #%d\n", this, android_atomic_dec(&gCount)-1); uninit(); } @@ -1631,7 +1631,7 @@ status_t ResTable::Theme::applyStyle(uint32_t resID, bool force) mTable.unlock(); - //LOGI("Applying style 0x%08x (force=%d) theme %p...\n", resID, force, this); + //ALOGI("Applying style 0x%08x (force=%d) theme %p...\n", resID, force, this); //dumpToLog(); return NO_ERROR; @@ -1639,7 +1639,7 @@ status_t ResTable::Theme::applyStyle(uint32_t resID, bool force) status_t ResTable::Theme::setTo(const Theme& other) { - //LOGI("Setting theme %p from theme %p...\n", this, &other); + //ALOGI("Setting theme %p from theme %p...\n", this, &other); //dumpToLog(); //other.dumpToLog(); @@ -1670,7 +1670,7 @@ status_t ResTable::Theme::setTo(const Theme& other) } } - //LOGI("Final theme:"); + //ALOGI("Final theme:"); //dumpToLog(); return NO_ERROR; @@ -1752,21 +1752,21 @@ ssize_t ResTable::Theme::resolveAttributeReference(Res_value* inOutValue, void ResTable::Theme::dumpToLog() const { - LOGI("Theme %p:\n", this); + ALOGI("Theme %p:\n", this); for (size_t i=0; i<Res_MAXPACKAGE; i++) { package_info* pi = mPackages[i]; if (pi == NULL) continue; - LOGI(" Package #0x%02x:\n", (int)(i+1)); + ALOGI(" Package #0x%02x:\n", (int)(i+1)); for (size_t j=0; j<pi->numTypes; j++) { type_info& ti = pi->types[j]; if (ti.numEntries == 0) continue; - LOGI(" Type #0x%02x:\n", (int)(j+1)); + ALOGI(" Type #0x%02x:\n", (int)(j+1)); for (size_t k=0; k<ti.numEntries; k++) { theme_entry& te = ti.entries[k]; if (te.value.dataType == Res_value::TYPE_NULL) continue; - LOGI(" 0x%08x: t=0x%x, d=0x%08x (block=%d)\n", + ALOGI(" 0x%08x: t=0x%x, d=0x%08x (block=%d)\n", (int)Res_MAKEID(i, j, k), te.value.dataType, (int)te.value.data, (int)te.stringBlock); } @@ -1779,7 +1779,7 @@ ResTable::ResTable() { memset(&mParams, 0, sizeof(mParams)); memset(mPackageMap, 0, sizeof(mPackageMap)); - //LOGI("Creating ResTable %p\n", this); + //ALOGI("Creating ResTable %p\n", this); } ResTable::ResTable(const void* data, size_t size, void* cookie, bool copyData) @@ -1789,12 +1789,12 @@ ResTable::ResTable(const void* data, size_t size, void* cookie, bool copyData) memset(mPackageMap, 0, sizeof(mPackageMap)); add(data, size, cookie, copyData); LOG_FATAL_IF(mError != NO_ERROR, "Error parsing resource table"); - //LOGI("Creating ResTable %p\n", this); + //ALOGI("Creating ResTable %p\n", this); } ResTable::~ResTable() { - //LOGI("Destroying ResTable in %p\n", this); + //ALOGI("Destroying ResTable in %p\n", this); uninit(); } @@ -1881,7 +1881,7 @@ status_t ResTable::add(const void* data, size_t size, void* cookie, header->header = (const ResTable_header*)data; header->size = dtohl(header->header->header.size); - //LOGI("Got size 0x%x, again size 0x%x, raw size 0x%x\n", header->size, + //ALOGI("Got size 0x%x, again size 0x%x, raw size 0x%x\n", header->size, // dtohl(header->header->header.size), header->header->header.size); LOAD_TABLE_NOISY(LOGV("Loading ResTable @%p:\n", header->header)); LOAD_TABLE_NOISY(printHexData(2, header->header, header->size < 256 ? header->size : 256, @@ -2350,7 +2350,7 @@ ssize_t ResTable::getBagLocked(uint32_t resID, const bag_entry** outBag, *outTypeSpecFlags = set->typeSpecFlags; } *outBag = (bag_entry*)(set+1); - //LOGI("Found existing bag for: %p\n", (void*)resID); + //ALOGI("Found existing bag for: %p\n", (void*)resID); return set->numAttrs; } LOGW("Attempt to retrieve bag 0x%08x which is invalid or in a cycle.", @@ -4273,7 +4273,7 @@ status_t ResTable::parsePackage(const ResTable_package* const pkg, TABLE_GETENTRY( ResTable_config thisConfig; thisConfig.copyFromDtoH(type->config); - LOGI("Adding config to type %d: imsi:%d/%d lang:%c%c cnt:%c%c " + ALOGI("Adding config to type %d: imsi:%d/%d lang:%c%c cnt:%c%c " "orien:%d touch:%d density:%d key:%d inp:%d nav:%d w:%d h:%d " "swdp:%d wdp:%d hdp:%d\n", type->id, diff --git a/libs/utils/Static.cpp b/libs/utils/Static.cpp index ceca435..bfcb2da 100644 --- a/libs/utils/Static.cpp +++ b/libs/utils/Static.cpp @@ -57,8 +57,8 @@ protected: virtual status_t writeLines(const struct iovec& vec, size_t N) { //android_writevLog(&vec, N); <-- this is now a no-op - if (N != 1) LOGI("WARNING: writeLines N=%d\n", N); - LOGI("%.*s", vec.iov_len, (const char*) vec.iov_base); + if (N != 1) ALOGI("WARNING: writeLines N=%d\n", N); + ALOGI("%.*s", vec.iov_len, (const char*) vec.iov_base); return NO_ERROR; } }; diff --git a/libs/utils/ZipFileRO.cpp b/libs/utils/ZipFileRO.cpp index 3069352..6ca9a28 100644 --- a/libs/utils/ZipFileRO.cpp +++ b/libs/utils/ZipFileRO.cpp @@ -210,7 +210,7 @@ bool ZipFileRO::mapCentralDirectory(void) ssize_t actual = TEMP_FAILURE_RETRY(read(mFd, scanBuf, sizeof(int32_t))); if (actual != (ssize_t) sizeof(int32_t)) { - LOGI("couldn't read first signature from zip archive: %s", strerror(errno)); + ALOGI("couldn't read first signature from zip archive: %s", strerror(errno)); free(scanBuf); return false; } @@ -218,7 +218,7 @@ bool ZipFileRO::mapCentralDirectory(void) { unsigned int header = get4LE(scanBuf); if (header == kEOCDSignature) { - LOGI("Found Zip archive, but it looks empty\n"); + ALOGI("Found Zip archive, but it looks empty\n"); free(scanBuf); return false; } else if (header != kLFHSignature) { @@ -761,7 +761,7 @@ bool ZipFileRO::uncompressEntry(ZipEntryRO entry, int fd) const (ZD_TYPE) actual, (ZD_TYPE) uncompLen); goto unmap; } else { - LOGI("+++ successful write\n"); + ALOGI("+++ successful write\n"); } } else { if (!inflateBuffer(fd, ptr, uncompLen, compLen)) diff --git a/media/jni/android_media_MediaRecorder.cpp b/media/jni/android_media_MediaRecorder.cpp index 31ef046..3fc75ed 100644 --- a/media/jni/android_media_MediaRecorder.cpp +++ b/media/jni/android_media_MediaRecorder.cpp @@ -328,7 +328,7 @@ android_media_MediaRecorder_prepare(JNIEnv *env, jobject thiz) return; } - LOGI("prepare: surface=%p (identity=%d)", native_surface.get(), native_surface->getIdentity()); + ALOGI("prepare: surface=%p (identity=%d)", native_surface.get(), native_surface->getIdentity()); if (process_media_recorder_call(env, mr->setPreviewSurface(native_surface), "java/lang/RuntimeException", "setPreviewSurface failed.")) { return; } diff --git a/media/jni/mediaeditor/VideoEditorLogging.h b/media/jni/mediaeditor/VideoEditorLogging.h index c13f6ff..479d8b6 100755 --- a/media/jni/mediaeditor/VideoEditorLogging.h +++ b/media/jni/mediaeditor/VideoEditorLogging.h @@ -29,7 +29,7 @@ #define VIDEOEDIT_LOG_ALLOCATION __android_log_print #define VIDEOEDIT_LOG_API __android_log_print #define VIDEOEDIT_LOG_FUNCTION __android_log_print -#define VIDEOEDIT_LOG_RESULT(x,y, ...) LOGI(y, __VA_ARGS__ ) +#define VIDEOEDIT_LOG_RESULT(x,y, ...) ALOGI(y, __VA_ARGS__ ) #define VIDEOEDIT_LOG_SETTING __android_log_print #define VIDEOEDIT_LOG_EDIT_SETTINGS(m_settings) videoEditClasses_logEditSettings\ (m_settings, VIDEOEDIT_LOG_INDENTATION) diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp index c0ba091..2be0ae2 100644 --- a/media/libmediaplayerservice/StagefrightRecorder.cpp +++ b/media/libmediaplayerservice/StagefrightRecorder.cpp @@ -1131,7 +1131,7 @@ void StagefrightRecorder::setDefaultProfileIfNecessary() { audioSampleRate == mSampleRate && audioChannels == mAudioChannels) { if (videoCodec == VIDEO_ENCODER_H264) { - LOGI("Force to use AVC baseline profile"); + ALOGI("Force to use AVC baseline profile"); setParamVideoEncoderProfile(OMX_VIDEO_AVCProfileBaseline); } } @@ -1268,7 +1268,7 @@ status_t StagefrightRecorder::setupSurfaceMediaSource() { int32_t frameRate = 0; CHECK (mSurfaceMediaSource->getFormat()->findInt32( kKeyFrameRate, &frameRate)); - LOGI("Frame rate is not explicitly set. Use the current frame " + ALOGI("Frame rate is not explicitly set. Use the current frame " "rate (%d fps)", frameRate); mFrameRate = frameRate; } else { @@ -1319,7 +1319,7 @@ status_t StagefrightRecorder::setupCameraSource( int32_t frameRate = 0; CHECK ((*cameraSource)->getFormat()->findInt32( kKeyFrameRate, &frameRate)); - LOGI("Frame rate is not explicitly set. Use the current frame " + ALOGI("Frame rate is not explicitly set. Use the current frame " "rate (%d fps)", frameRate); mFrameRate = frameRate; } diff --git a/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp b/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp index 079f6fa..1612df0 100644 --- a/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp +++ b/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp @@ -111,9 +111,9 @@ status_t NuPlayer::HTTPLiveSource::feedMoreTSData() { break; } else if (n < 0) { if (n != ERROR_END_OF_STREAM) { - LOGI("input data EOS reached, error %ld", n); + ALOGI("input data EOS reached, error %ld", n); } else { - LOGI("input data EOS reached."); + ALOGI("input data EOS reached."); } mTSParser->signalEOS(n); mFinalResult = n; diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp index b43b915..7d69052 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp @@ -705,7 +705,7 @@ status_t NuPlayer::feedDecoderInputData(bool audio, const sp<AMessage> &msg) { int64_t resumeAtMediaTimeUs; if (extra->findInt64( "resume-at-mediatimeUs", &resumeAtMediaTimeUs)) { - LOGI("suppressing rendering of %s until %lld us", + ALOGI("suppressing rendering of %s until %lld us", audio ? "audio" : "video", resumeAtMediaTimeUs); if (audio) { @@ -838,7 +838,7 @@ void NuPlayer::notifyListener(int msg, int ext1, int ext2) { void NuPlayer::flushDecoder(bool audio, bool needShutdown) { if ((audio && mAudioDecoder == NULL) || (!audio && mVideoDecoder == NULL)) { - LOGI("flushDecoder %s without decoder present", + ALOGI("flushDecoder %s without decoder present", audio ? "audio" : "video"); } diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp index 3711eb4..074cb4f 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp @@ -228,7 +228,7 @@ bool NuPlayer::Renderer::onDrainAudioQueue() { #if 0 if (numFramesAvailableToWrite == mAudioSink->frameCount()) { - LOGI("audio sink underrun"); + ALOGI("audio sink underrun"); } else { ALOGV("audio queue has %d frames left to play", mAudioSink->frameCount() - numFramesAvailableToWrite); @@ -270,7 +270,7 @@ bool NuPlayer::Renderer::onDrainAudioQueue() { + numFramesPendingPlayout * mAudioSink->msecsPerFrame()) * 1000ll; - // LOGI("realTimeOffsetUs = %lld us", realTimeOffsetUs); + // ALOGI("realTimeOffsetUs = %lld us", realTimeOffsetUs); mAnchorTimeRealUs = ALooper::GetNowUs() + realTimeOffsetUs; diff --git a/media/libmediaplayerservice/nuplayer/RTSPSource.cpp b/media/libmediaplayerservice/nuplayer/RTSPSource.cpp index 6d28298..6eb0d07 100644 --- a/media/libmediaplayerservice/nuplayer/RTSPSource.cpp +++ b/media/libmediaplayerservice/nuplayer/RTSPSource.cpp @@ -226,7 +226,7 @@ void NuPlayer::RTSPSource::onMessageReceived(const sp<AMessage> &msg) { int32_t damaged; if (accessUnit->meta()->findInt32("damaged", &damaged) && damaged) { - LOGI("dropping damaged access unit."); + ALOGI("dropping damaged access unit."); break; } diff --git a/media/libmediaplayerservice/nuplayer/StreamingSource.cpp b/media/libmediaplayerservice/nuplayer/StreamingSource.cpp index 2e63b3b..c997942 100644 --- a/media/libmediaplayerservice/nuplayer/StreamingSource.cpp +++ b/media/libmediaplayerservice/nuplayer/StreamingSource.cpp @@ -58,7 +58,7 @@ status_t NuPlayer::StreamingSource::feedMoreTSData() { ssize_t n = mStreamListener->read(buffer, sizeof(buffer), &extra); if (n == 0) { - LOGI("input data EOS reached."); + ALOGI("input data EOS reached."); mTSParser->signalEOS(ERROR_END_OF_STREAM); mFinalResult = ERROR_END_OF_STREAM; break; diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 6fb16f5..6fce890 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -280,9 +280,9 @@ status_t AwesomePlayer::setDataSource_l( } if (!(mFlags & INCOGNITO)) { - LOGI("setDataSource_l('%s')", mUri.string()); + ALOGI("setDataSource_l('%s')", mUri.string()); } else { - LOGI("setDataSource_l(URL suppressed)"); + ALOGI("setDataSource_l(URL suppressed)"); } // The actual work will be done during preparation in the call to @@ -483,7 +483,7 @@ void AwesomePlayer::reset_l() { if (mFlags & PREPARING) { modifyFlags(PREPARE_CANCELLED, SET); if (mConnectingDataSource != NULL) { - LOGI("interrupting the connection process"); + ALOGI("interrupting the connection process"); mConnectingDataSource->disconnect(); } @@ -686,7 +686,7 @@ void AwesomePlayer::onBufferingUpdate() { if ((mFlags & PLAYING) && !eos && (cachedDataRemaining < kLowWaterMarkBytes)) { - LOGI("cache is running low (< %d) , pausing.", + ALOGI("cache is running low (< %d) , pausing.", kLowWaterMarkBytes); modifyFlags(CACHE_UNDERRUN, SET); pause_l(); @@ -695,7 +695,7 @@ void AwesomePlayer::onBufferingUpdate() { notifyListener_l(MEDIA_INFO, MEDIA_INFO_BUFFERING_START); } else if (eos || cachedDataRemaining > kHighWaterMarkBytes) { if (mFlags & CACHE_UNDERRUN) { - LOGI("cache has filled up (> %d), resuming.", + ALOGI("cache has filled up (> %d), resuming.", kHighWaterMarkBytes); modifyFlags(CACHE_UNDERRUN, CLEAR); play_l(); @@ -742,7 +742,7 @@ void AwesomePlayer::onBufferingUpdate() { if ((mFlags & PLAYING) && !eos && (cachedDurationUs < kLowWaterMarkUs)) { - LOGI("cache is running low (%.2f secs) , pausing.", + ALOGI("cache is running low (%.2f secs) , pausing.", cachedDurationUs / 1E6); modifyFlags(CACHE_UNDERRUN, SET); pause_l(); @@ -751,7 +751,7 @@ void AwesomePlayer::onBufferingUpdate() { notifyListener_l(MEDIA_INFO, MEDIA_INFO_BUFFERING_START); } else if (eos || cachedDurationUs > kHighWaterMarkUs) { if (mFlags & CACHE_UNDERRUN) { - LOGI("cache has filled up (%.2f secs), resuming.", + ALOGI("cache has filled up (%.2f secs), resuming.", cachedDurationUs / 1E6); modifyFlags(CACHE_UNDERRUN, CLEAR); play_l(); @@ -1667,7 +1667,7 @@ void AwesomePlayer::onVideoEvent() { if (mSeeking == SEEK_VIDEO_ONLY) { if (mSeekTimeUs > timeUs) { - LOGI("XXX mSeekTimeUs = %lld us, timeUs = %lld us", + ALOGI("XXX mSeekTimeUs = %lld us, timeUs = %lld us", mSeekTimeUs, timeUs); } } @@ -1715,7 +1715,7 @@ void AwesomePlayer::onVideoEvent() { int64_t latenessUs = nowUs - timeUs; if (latenessUs > 0) { - LOGI("after SEEK_VIDEO_ONLY we're late by %.2f secs", latenessUs / 1E6); + ALOGI("after SEEK_VIDEO_ONLY we're late by %.2f secs", latenessUs / 1E6); } } @@ -1730,7 +1730,7 @@ void AwesomePlayer::onVideoEvent() { && mAudioPlayer != NULL && mAudioPlayer->getMediaTimeMapping( &realTimeUs, &mediaTimeUs)) { - LOGI("we're much too late (%.2f secs), video skipping ahead", + ALOGI("we're much too late (%.2f secs), video skipping ahead", latenessUs / 1E6); mVideoBuffer->release(); @@ -1975,7 +1975,7 @@ status_t AwesomePlayer::finishSetDataSource_l() { if (err != OK) { mConnectingDataSource.clear(); - LOGI("mConnectingDataSource->connect() returned %d", err); + ALOGI("mConnectingDataSource->connect() returned %d", err); return err; } @@ -2073,7 +2073,7 @@ status_t AwesomePlayer::finishSetDataSource_l() { } if (mFlags & PREPARE_CANCELLED) { - LOGI("Prepare cancelled while waiting for initial cache fill."); + ALOGI("Prepare cancelled while waiting for initial cache fill."); return UNKNOWN_ERROR; } } @@ -2155,7 +2155,7 @@ void AwesomePlayer::onPrepareAsyncEvent() { Mutex::Autolock autoLock(mLock); if (mFlags & PREPARE_CANCELLED) { - LOGI("prepare was cancelled before doing anything"); + ALOGI("prepare was cancelled before doing anything"); abortPrepare(UNKNOWN_ERROR); return; } diff --git a/media/libstagefright/CameraSource.cpp b/media/libstagefright/CameraSource.cpp index 080faa6..966b457 100755 --- a/media/libstagefright/CameraSource.cpp +++ b/media/libstagefright/CameraSource.cpp @@ -660,7 +660,7 @@ status_t CameraSource::stop() { } if (mCollectStats) { - LOGI("Frames received/encoded/dropped: %d/%d/%d in %lld us", + ALOGI("Frames received/encoded/dropped: %d/%d/%d in %lld us", mNumFramesReceived, mNumFramesEncoded, mNumFramesDropped, mLastFrameTimestampUs - mFirstFrameTimeUs); } @@ -832,7 +832,7 @@ void CameraSource::ProxyListener::dataCallbackTimestamp( } void CameraSource::DeathNotifier::binderDied(const wp<IBinder>& who) { - LOGI("Camera recording proxy died"); + ALOGI("Camera recording proxy died"); } } // namespace android diff --git a/media/libstagefright/CameraSourceTimeLapse.cpp b/media/libstagefright/CameraSourceTimeLapse.cpp index 22c3182..8bf18b2 100644 --- a/media/libstagefright/CameraSourceTimeLapse.cpp +++ b/media/libstagefright/CameraSourceTimeLapse.cpp @@ -260,7 +260,7 @@ bool CameraSourceTimeLapse::skipFrameAndModifyTimeStamp(int64_t *timestampUs) { // Really make sure that this video recording frame will not be dropped. if (*timestampUs < mStartTimeUs) { - LOGI("set timestampUs to start time stamp %lld us", mStartTimeUs); + ALOGI("set timestampUs to start time stamp %lld us", mStartTimeUs); *timestampUs = mStartTimeUs; } return false; diff --git a/media/libstagefright/HTTPBase.cpp b/media/libstagefright/HTTPBase.cpp index 3c5a8a5..5950b37 100644 --- a/media/libstagefright/HTTPBase.cpp +++ b/media/libstagefright/HTTPBase.cpp @@ -115,7 +115,7 @@ status_t HTTPBase::setBandwidthStatCollectFreq(int32_t freqMs) { return BAD_VALUE; } - LOGI("frequency set to %d ms", freqMs); + ALOGI("frequency set to %d ms", freqMs); mBandWidthCollectFreqMs = freqMs; return OK; } diff --git a/media/libstagefright/MP3Extractor.cpp b/media/libstagefright/MP3Extractor.cpp index ab1dc5c..cb82deb 100644 --- a/media/libstagefright/MP3Extractor.cpp +++ b/media/libstagefright/MP3Extractor.cpp @@ -431,7 +431,7 @@ status_t MP3Source::read( int32_t bitrate; if (!mMeta->findInt32(kKeyBitRate, &bitrate)) { // bitrate is in bits/sec. - LOGI("no bitrate"); + ALOGI("no bitrate"); return ERROR_UNSUPPORTED; } diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 8b85cfd..45d711c 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1499,9 +1499,9 @@ status_t MPEG4Extractor::parseTrackHeader( int32_t dy = U32_AT(&buffer[matrixOffset + 20]); #if 0 - LOGI("x' = %.2f * x + %.2f * y + %.2f", + ALOGI("x' = %.2f * x + %.2f * y + %.2f", a00 / 65536.0f, a01 / 65536.0f, dx / 65536.0f); - LOGI("y' = %.2f * x + %.2f * y + %.2f", + ALOGI("y' = %.2f * x + %.2f * y + %.2f", a10 / 65536.0f, a11 / 65536.0f, dy / 65536.0f); #endif @@ -2035,7 +2035,7 @@ status_t MPEG4Source::read( CHECK_EQ(OK, mSampleTable->getMetaDataForSample( syncSampleIndex, NULL, NULL, &syncSampleTime)); - LOGI("seek to time %lld us => sample at time %lld us, " + ALOGI("seek to time %lld us => sample at time %lld us, " "sync sample at time %lld us", seekTimeUs, sampleTime * 1000000ll / mTimescale, diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp index a368e0a..b808cc0 100755 --- a/media/libstagefright/MPEG4Writer.cpp +++ b/media/libstagefright/MPEG4Writer.cpp @@ -406,7 +406,7 @@ int64_t MPEG4Writer::estimateMoovBoxSize(int32_t bitRate) { size = MAX_MOOV_BOX_SIZE; } - LOGI("limits: %lld/%lld bytes/us, bit rate: %d bps and the estimated" + ALOGI("limits: %lld/%lld bytes/us, bit rate: %d bps and the estimated" " moov size %lld bytes", mMaxFileSizeLimitBytes, mMaxFileDurationLimitUs, bitRate, size); return factor * size; @@ -701,7 +701,7 @@ status_t MPEG4Writer::stop() { mMoovBoxBuffer = NULL; mMoovBoxBufferOffset = 0; } else { - LOGI("The mp4 file will not be streamable."); + ALOGI("The mp4 file will not be streamable."); } CHECK(mBoxes.empty()); @@ -1084,12 +1084,12 @@ bool MPEG4Writer::reachedEOS() { } void MPEG4Writer::setStartTimestampUs(int64_t timeUs) { - LOGI("setStartTimestampUs: %lld", timeUs); + ALOGI("setStartTimestampUs: %lld", timeUs); CHECK(timeUs >= 0); Mutex::Autolock autoLock(mLock); if (mStartTimestampUs < 0 || mStartTimestampUs > timeUs) { mStartTimestampUs = timeUs; - LOGI("Earliest track starting time: %lld", mStartTimestampUs); + ALOGI("Earliest track starting time: %lld", mStartTimestampUs); } } @@ -1481,7 +1481,7 @@ status_t MPEG4Writer::Track::start(MetaData *params) { startTimeOffsetUs = kInitialDelayTimeUs; } startTimeUs += startTimeOffsetUs; - LOGI("Start time offset: %lld us", startTimeOffsetUs); + ALOGI("Start time offset: %lld us", startTimeOffsetUs); } meta->setInt64(kKeyTime, startTimeUs); @@ -2146,10 +2146,10 @@ status_t MPEG4Writer::Track::threadEntry() { sendTrackSummary(hasMultipleTracks); - LOGI("Received total/0-length (%d/%d) buffers and encoded %d frames. - %s", + ALOGI("Received total/0-length (%d/%d) buffers and encoded %d frames. - %s", count, nZeroLengthFrames, mNumSamples, mIsAudio? "audio": "video"); if (mIsAudio) { - LOGI("Audio track drift time: %lld us", mOwner->getDriftTimeUs()); + ALOGI("Audio track drift time: %lld us", mOwner->getDriftTimeUs()); } if (err == ERROR_END_OF_STREAM) { diff --git a/media/libstagefright/NuCachedSource2.cpp b/media/libstagefright/NuCachedSource2.cpp index 20d0632..6e5f8ab 100644 --- a/media/libstagefright/NuCachedSource2.cpp +++ b/media/libstagefright/NuCachedSource2.cpp @@ -302,7 +302,7 @@ void NuCachedSource2::fetchInternal() { mNumRetriesLeft = 0; return; } else if (err != OK) { - LOGI("The attempt to reconnect failed, %d retries remaining", + ALOGI("The attempt to reconnect failed, %d retries remaining", mNumRetriesLeft); return; @@ -321,7 +321,7 @@ void NuCachedSource2::fetchInternal() { mFinalStatus = n; mCache->releasePage(page); } else if (n == 0) { - LOGI("ERROR_END_OF_STREAM"); + ALOGI("ERROR_END_OF_STREAM"); mNumRetriesLeft = 0; mFinalStatus = ERROR_END_OF_STREAM; @@ -329,7 +329,7 @@ void NuCachedSource2::fetchInternal() { mCache->releasePage(page); } else { if (mFinalStatus != OK) { - LOGI("retrying a previously failed read succeeded."); + ALOGI("retrying a previously failed read succeeded."); } mNumRetriesLeft = kMaxNumRetries; mFinalStatus = OK; @@ -355,7 +355,7 @@ void NuCachedSource2::onFetch() { if (mFetching || keepAlive) { if (keepAlive) { - LOGI("Keep alive"); + ALOGI("Keep alive"); } fetchInternal(); @@ -363,7 +363,7 @@ void NuCachedSource2::onFetch() { mLastFetchTimeUs = ALooper::GetNowUs(); if (mFetching && mCache->totalSize() >= mHighwaterThresholdBytes) { - LOGI("Cache full, done prefetching for now"); + ALOGI("Cache full, done prefetching for now"); mFetching = false; if (mDisconnectAtHighwatermark @@ -448,7 +448,7 @@ void NuCachedSource2::restartPrefetcherIfNecessary_l( size_t actualBytes = mCache->releaseFromStart(maxBytes); mCacheOffset += actualBytes; - LOGI("restarting prefetcher, totalSize = %d", mCache->totalSize()); + ALOGI("restarting prefetcher, totalSize = %d", mCache->totalSize()); mFetching = true; } @@ -584,7 +584,7 @@ status_t NuCachedSource2::seekInternal_l(off64_t offset) { return OK; } - LOGI("new range: offset= %lld", offset); + ALOGI("new range: offset= %lld", offset); mCacheOffset = offset; diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index f9f92d2..2dc19fd 100755 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -179,7 +179,7 @@ static const CodecInfo kEncoderInfo[] = { #undef OPTIONAL -#define CODEC_LOGI(x, ...) LOGI("[%s] "x, mComponentName, ##__VA_ARGS__) +#define CODEC_LOGI(x, ...) ALOGI("[%s] "x, mComponentName, ##__VA_ARGS__) #define CODEC_LOGV(x, ...) ALOGV("[%s] "x, mComponentName, ##__VA_ARGS__) #define CODEC_LOGE(x, ...) LOGE("[%s] "x, mComponentName, ##__VA_ARGS__) diff --git a/media/libstagefright/OggExtractor.cpp b/media/libstagefright/OggExtractor.cpp index 5a68d79..b7a9faf 100644 --- a/media/libstagefright/OggExtractor.cpp +++ b/media/libstagefright/OggExtractor.cpp @@ -189,9 +189,9 @@ status_t OggSource::read( #if 0 int64_t timeUs; if (packet->meta_data()->findInt64(kKeyTime, &timeUs)) { - LOGI("found time = %lld us", timeUs); + ALOGI("found time = %lld us", timeUs); } else { - LOGI("NO time"); + ALOGI("NO time"); } #endif @@ -777,7 +777,7 @@ void MyVorbisExtractor::parseFileMetaData() { const char *comment = mVc.user_comments[i]; size_t commentLength = mVc.comment_lengths[i]; parseVorbisComment(mFileMeta, comment, commentLength); - //LOGI("comment #%d: '%s'", i + 1, mVc.user_comments[i]); + //ALOGI("comment #%d: '%s'", i + 1, mVc.user_comments[i]); } } diff --git a/media/libstagefright/SampleTable.cpp b/media/libstagefright/SampleTable.cpp index 9a66577..59624d0 100644 --- a/media/libstagefright/SampleTable.cpp +++ b/media/libstagefright/SampleTable.cpp @@ -347,7 +347,7 @@ status_t SampleTable::setTimeToSampleParams( status_t SampleTable::setCompositionTimeToSampleParams( off64_t data_offset, size_t data_size) { - LOGI("There are reordered frames present."); + ALOGI("There are reordered frames present."); if (mCompositionTimeDeltaEntries != NULL || data_size < 8) { return ERROR_MALFORMED; diff --git a/media/libstagefright/VBRISeeker.cpp b/media/libstagefright/VBRISeeker.cpp index ecff538..6ac5a83 100644 --- a/media/libstagefright/VBRISeeker.cpp +++ b/media/libstagefright/VBRISeeker.cpp @@ -120,7 +120,7 @@ sp<VBRISeeker> VBRISeeker::CreateFromSource( delete[] buffer; buffer = NULL; - LOGI("Found VBRI header."); + ALOGI("Found VBRI header."); return seeker; } diff --git a/media/libstagefright/avc_utils.cpp b/media/libstagefright/avc_utils.cpp index 1ed9e577..65c1848 100644 --- a/media/libstagefright/avc_utils.cpp +++ b/media/libstagefright/avc_utils.cpp @@ -290,7 +290,7 @@ sp<MetaData> MakeAVCCodecSpecificData(const sp<ABuffer> &accessUnit) { memcpy(out, picParamSet->data(), picParamSet->size()); #if 0 - LOGI("AVC seq param set"); + ALOGI("AVC seq param set"); hexdump(seqParamSet->data(), seqParamSet->size()); #endif @@ -301,7 +301,7 @@ sp<MetaData> MakeAVCCodecSpecificData(const sp<ABuffer> &accessUnit) { meta->setInt32(kKeyWidth, width); meta->setInt32(kKeyHeight, height); - LOGI("found AVC codec config (%d x %d, %s-profile level %d.%d)", + ALOGI("found AVC codec config (%d x %d, %s-profile level %d.%d)", width, height, AVCProfileToString(profile), level / 10, level % 10); return meta; diff --git a/media/libstagefright/codecs/avc/enc/AVCEncoder.cpp b/media/libstagefright/codecs/avc/enc/AVCEncoder.cpp index 18c5550..37df634 100644 --- a/media/libstagefright/codecs/avc/enc/AVCEncoder.cpp +++ b/media/libstagefright/codecs/avc/enc/AVCEncoder.cpp @@ -178,7 +178,7 @@ AVCEncoder::AVCEncoder( mInputFrameData(NULL), mGroup(NULL) { - LOGI("Construct software AVCEncoder"); + ALOGI("Construct software AVCEncoder"); mHandle = new tagAVCHandle; memset(mHandle, 0, sizeof(tagAVCHandle)); diff --git a/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp b/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp index 2e3d12d..1188780 100644 --- a/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp +++ b/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp @@ -178,7 +178,7 @@ M4vH263Encoder::M4vH263Encoder( mInputFrameData(NULL), mGroup(NULL) { - LOGI("Construct software M4vH263Encoder"); + ALOGI("Construct software M4vH263Encoder"); mHandle = new tagvideoEncControls; memset(mHandle, 0, sizeof(tagvideoEncControls)); diff --git a/media/libstagefright/foundation/hexdump.cpp b/media/libstagefright/foundation/hexdump.cpp index 9f6bf9e..16c1ca5 100644 --- a/media/libstagefright/foundation/hexdump.cpp +++ b/media/libstagefright/foundation/hexdump.cpp @@ -67,7 +67,7 @@ void hexdump(const void *_data, size_t size) { } } - LOGI("%s", line.c_str()); + ALOGI("%s", line.c_str()); offset += 16; } diff --git a/media/libstagefright/httplive/LiveSession.cpp b/media/libstagefright/httplive/LiveSession.cpp index 422850d..d1d8eb2 100644 --- a/media/libstagefright/httplive/LiveSession.cpp +++ b/media/libstagefright/httplive/LiveSession.cpp @@ -168,9 +168,9 @@ void LiveSession::onConnect(const sp<AMessage> &msg) { } if (!(mFlags & kFlagIncognito)) { - LOGI("onConnect '%s'", url.c_str()); + ALOGI("onConnect '%s'", url.c_str()); } else { - LOGI("onConnect <URL suppressed>"); + ALOGI("onConnect <URL suppressed>"); } mMasterURL = url; @@ -207,7 +207,7 @@ void LiveSession::onConnect(const sp<AMessage> &msg) { } void LiveSession::onDisconnect() { - LOGI("onDisconnect"); + ALOGI("onDisconnect"); mDataSource->queueEOS(ERROR_END_OF_STREAM); @@ -572,7 +572,7 @@ rinse_repeat: int32_t newSeqNumber = firstSeqNumberInPlaylist + index; if (newSeqNumber != mSeqNumber) { - LOGI("seeking to seq no %d", newSeqNumber); + ALOGI("seeking to seq no %d", newSeqNumber); mSeqNumber = newSeqNumber; @@ -609,7 +609,7 @@ rinse_repeat: if (mPrevBandwidthIndex != (ssize_t)bandwidthIndex) { // Go back to the previous bandwidth. - LOGI("new bandwidth does not have the sequence number " + ALOGI("new bandwidth does not have the sequence number " "we're looking for, switching back to previous bandwidth"); mLastPlaylistFetchTimeUs = -1; @@ -629,7 +629,7 @@ rinse_repeat: // we've missed the boat, let's start from the lowest sequence // number available and signal a discontinuity. - LOGI("We've missed the boat, restarting playback."); + ALOGI("We've missed the boat, restarting playback."); mSeqNumber = lastSeqNumberInPlaylist; explicitDiscontinuity = true; @@ -690,7 +690,7 @@ rinse_repeat: return; } - LOGI("Retrying with a different bandwidth stream."); + ALOGI("Retrying with a different bandwidth stream."); mLastPlaylistFetchTimeUs = -1; bandwidthIndex = getBandwidthIndex(); @@ -713,7 +713,7 @@ rinse_repeat: if (seekDiscontinuity || explicitDiscontinuity || bandwidthChanged) { // Signal discontinuity. - LOGI("queueing discontinuity (seek=%d, explicit=%d, bandwidthChanged=%d)", + ALOGI("queueing discontinuity (seek=%d, explicit=%d, bandwidthChanged=%d)", seekDiscontinuity, explicitDiscontinuity, bandwidthChanged); sp<ABuffer> tmp = new ABuffer(188); diff --git a/media/libstagefright/httplive/M3UParser.cpp b/media/libstagefright/httplive/M3UParser.cpp index 0d84c83..71f998c 100644 --- a/media/libstagefright/httplive/M3UParser.cpp +++ b/media/libstagefright/httplive/M3UParser.cpp @@ -168,7 +168,7 @@ status_t M3UParser::parse(const void *_data, size_t size) { line.setTo(&data[offset], offsetLF - offset); } - // LOGI("#%s#", line.c_str()); + // ALOGI("#%s#", line.c_str()); if (line.empty()) { offset = offsetLF + 1; diff --git a/media/libstagefright/matroska/MatroskaExtractor.cpp b/media/libstagefright/matroska/MatroskaExtractor.cpp index 474c794..f215f52 100644 --- a/media/libstagefright/matroska/MatroskaExtractor.cpp +++ b/media/libstagefright/matroska/MatroskaExtractor.cpp @@ -563,7 +563,7 @@ MatroskaExtractor::MatroskaExtractor(const sp<DataSource> &source) #if 0 const mkvparser::SegmentInfo *info = mSegment->GetInfo(); - LOGI("muxing app: %s, writing app: %s", + ALOGI("muxing app: %s, writing app: %s", info->GetMuxingAppAsUTF8(), info->GetWritingAppAsUTF8()); #endif diff --git a/media/libstagefright/mpeg2ts/ATSParser.cpp b/media/libstagefright/mpeg2ts/ATSParser.cpp index da911e4..576693a 100644 --- a/media/libstagefright/mpeg2ts/ATSParser.cpp +++ b/media/libstagefright/mpeg2ts/ATSParser.cpp @@ -282,7 +282,7 @@ status_t ATSParser::Program::parseProgramMap(ABitReader *br) { ssize_t index = mStreams.indexOfKey(info.mPID); if (index >= 0 && mStreams.editValueAt(index)->type() != info.mType) { - LOGI("uh oh. stream PIDs have changed."); + ALOGI("uh oh. stream PIDs have changed."); PIDsChanged = true; break; } @@ -290,18 +290,18 @@ status_t ATSParser::Program::parseProgramMap(ABitReader *br) { if (PIDsChanged) { #if 0 - LOGI("before:"); + ALOGI("before:"); for (size_t i = 0; i < mStreams.size(); ++i) { sp<Stream> stream = mStreams.editValueAt(i); - LOGI("PID 0x%08x => type 0x%02x", stream->pid(), stream->type()); + ALOGI("PID 0x%08x => type 0x%02x", stream->pid(), stream->type()); } - LOGI("after:"); + ALOGI("after:"); for (size_t i = 0; i < infos.size(); ++i) { StreamInfo &info = infos.editItemAt(i); - LOGI("PID 0x%08x => type 0x%02x", info.mPID, info.mType); + ALOGI("PID 0x%08x => type 0x%02x", info.mPID, info.mType); } #endif @@ -340,7 +340,7 @@ status_t ATSParser::Program::parseProgramMap(ABitReader *br) { } if (!success) { - LOGI("Stream PIDs changed and we cannot recover."); + ALOGI("Stream PIDs changed and we cannot recover."); return ERROR_MALFORMED; } } @@ -475,7 +475,7 @@ status_t ATSParser::Stream::parse( // Increment in multiples of 64K. neededSize = (neededSize + 65535) & ~65535; - LOGI("resizing buffer to %d bytes", neededSize); + ALOGI("resizing buffer to %d bytes", neededSize); sp<ABuffer> newBuffer = new ABuffer(neededSize); memcpy(newBuffer->data(), mBuffer->data(), mBuffer->size()); @@ -634,7 +634,7 @@ status_t ATSParser::Stream::parsePES(ABitReader *br) { CHECK_EQ(br->getBits(1), 1u); ALOGV("PTS = %llu", PTS); - // LOGI("PTS = %.2f secs", PTS / 90000.0f); + // ALOGI("PTS = %.2f secs", PTS / 90000.0f); optional_bytes_remaining -= 5; @@ -968,7 +968,7 @@ status_t ATSParser::parseTS(ABitReader *br) { unsigned continuity_counter = br->getBits(4); ALOGV("continuity_counter = %u", continuity_counter); - // LOGI("PID = 0x%04x, continuity_counter = %u", PID, continuity_counter); + // ALOGI("PID = 0x%04x, continuity_counter = %u", PID, continuity_counter); if (adaptation_field_control == 2 || adaptation_field_control == 3) { parseAdaptationField(br); diff --git a/media/libstagefright/mpeg2ts/ESQueue.cpp b/media/libstagefright/mpeg2ts/ESQueue.cpp index edb4232..05c87fd 100644 --- a/media/libstagefright/mpeg2ts/ESQueue.cpp +++ b/media/libstagefright/mpeg2ts/ESQueue.cpp @@ -144,7 +144,7 @@ status_t ElementaryStreamQueue::appendData( } if (startOffset > 0) { - LOGI("found something resembling an H.264/MPEG syncword at " + ALOGI("found something resembling an H.264/MPEG syncword at " "offset %ld", startOffset); } @@ -177,7 +177,7 @@ status_t ElementaryStreamQueue::appendData( } if (startOffset > 0) { - LOGI("found something resembling an H.264/MPEG syncword at " + ALOGI("found something resembling an H.264/MPEG syncword at " "offset %ld", startOffset); } @@ -210,7 +210,7 @@ status_t ElementaryStreamQueue::appendData( } if (startOffset > 0) { - LOGI("found something resembling an AAC syncword at offset %ld", + ALOGI("found something resembling an AAC syncword at offset %ld", startOffset); } @@ -237,7 +237,7 @@ status_t ElementaryStreamQueue::appendData( } if (startOffset > 0) { - LOGI("found something resembling an MPEG audio " + ALOGI("found something resembling an MPEG audio " "syncword at offset %ld", startOffset); } @@ -280,7 +280,7 @@ status_t ElementaryStreamQueue::appendData( #if 0 if (mMode == AAC) { - LOGI("size = %d, timeUs = %.2f secs", size, timeUs / 1E6); + ALOGI("size = %d, timeUs = %.2f secs", size, timeUs / 1E6); hexdump(data, size); } #endif @@ -337,7 +337,7 @@ sp<ABuffer> ElementaryStreamQueue::dequeueAccessUnitAAC() { CHECK(mFormat->findInt32(kKeySampleRate, &sampleRate)); CHECK(mFormat->findInt32(kKeyChannelCount, &numChannels)); - LOGI("found AAC codec config (%d Hz, %d channels)", + ALOGI("found AAC codec config (%d Hz, %d channels)", sampleRate, numChannels); } else { // profile_ObjectType, sampling_frequency_index, private_bits, @@ -714,7 +714,7 @@ sp<ABuffer> ElementaryStreamQueue::dequeueAccessUnitMPEGVideo() { mFormat->setInt32(kKeyWidth, width); mFormat->setInt32(kKeyHeight, height); - LOGI("found MPEG2 video codec config (%d x %d)", width, height); + ALOGI("found MPEG2 video codec config (%d x %d)", width, height); sp<ABuffer> csd = new ABuffer(offset); memcpy(csd->data(), data, offset); @@ -880,7 +880,7 @@ sp<ABuffer> ElementaryStreamQueue::dequeueAccessUnitMPEG4Video() { mFormat->setInt32(kKeyWidth, width); mFormat->setInt32(kKeyHeight, height); - LOGI("found MPEG4 video codec config (%d x %d)", + ALOGI("found MPEG4 video codec config (%d x %d)", width, height); sp<ABuffer> csd = new ABuffer(offset); diff --git a/media/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp b/media/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp index df30a9c..727c931 100644 --- a/media/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp +++ b/media/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp @@ -315,7 +315,7 @@ ssize_t MPEG2PSExtractor::dequeuePES() { unsigned descriptor_tag = br.getBits(8); unsigned descriptor_length = br.getBits(8); - LOGI("found descriptor tag 0x%02x of length %u", + ALOGI("found descriptor tag 0x%02x of length %u", descriptor_tag, descriptor_length); if (offset + 2 + descriptor_length > program_stream_info_length) { @@ -338,7 +338,7 @@ ssize_t MPEG2PSExtractor::dequeuePES() { unsigned stream_type = br.getBits(8); unsigned elementary_stream_id = br.getBits(8); - LOGI("elementary stream id 0x%02x has stream type 0x%02x", + ALOGI("elementary stream id 0x%02x has stream type 0x%02x", elementary_stream_id, stream_type); mStreamTypeByESID.add(elementary_stream_id, stream_type); @@ -409,7 +409,7 @@ ssize_t MPEG2PSExtractor::dequeuePES() { CHECK_EQ(br.getBits(1), 1u); ALOGV("PTS = %llu", PTS); - // LOGI("PTS = %.2f secs", PTS / 90000.0f); + // ALOGI("PTS = %.2f secs", PTS / 90000.0f); optional_bytes_remaining -= 5; @@ -568,7 +568,7 @@ MPEG2PSExtractor::Track::Track( if (supported) { mQueue = new ElementaryStreamQueue(mode); } else { - LOGI("unsupported stream ID 0x%02x", stream_id); + ALOGI("unsupported stream ID 0x%02x", stream_id); } } diff --git a/media/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp b/media/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp index 17cf45a..03033f5 100644 --- a/media/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp +++ b/media/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp @@ -199,7 +199,7 @@ void MPEG2TSExtractor::init() { } } - LOGI("haveAudio=%d, haveVideo=%d", haveAudio, haveVideo); + ALOGI("haveAudio=%d, haveVideo=%d", haveAudio, haveVideo); } status_t MPEG2TSExtractor::feedMore() { diff --git a/media/libstagefright/omx/tests/OMXHarness.cpp b/media/libstagefright/omx/tests/OMXHarness.cpp index d4354db..3a15a5e 100644 --- a/media/libstagefright/omx/tests/OMXHarness.cpp +++ b/media/libstagefright/omx/tests/OMXHarness.cpp @@ -571,7 +571,7 @@ status_t Harness::testSeek( const char *mime = GetMimeFromComponentRole(componentRole); if (!mime) { - LOGI("Cannot perform seek test with this componentRole (%s)", + ALOGI("Cannot perform seek test with this componentRole (%s)", componentRole); return OK; @@ -597,7 +597,7 @@ status_t Harness::testSeek( int64_t durationUs; CHECK(source->getFormat()->findInt64(kKeyDuration, &durationUs)); - LOGI("stream duration is %lld us (%.2f secs)", + ALOGI("stream duration is %lld us (%.2f secs)", durationUs, durationUs / 1E6); static const int32_t kNumIterations = 5000; @@ -617,19 +617,19 @@ status_t Harness::testSeek( requestedSeekTimeUs = -1; - LOGI("requesting linear read"); + ALOGI("requesting linear read"); } else { if (i == 0 || r < 0.55) { // 5% chance of seeking beyond end of stream. requestedSeekTimeUs = durationUs; - LOGI("requesting seek beyond EOF"); + ALOGI("requesting seek beyond EOF"); } else { requestedSeekTimeUs = (int64_t)(uniform_rand() * durationUs); - LOGI("requesting seek to %lld us (%.2f secs)", + ALOGI("requesting seek to %lld us (%.2f secs)", requestedSeekTimeUs, requestedSeekTimeUs / 1E6); } @@ -649,7 +649,7 @@ status_t Harness::testSeek( buffer = NULL; } - LOGI("nearest keyframe is at %lld us (%.2f secs)", + ALOGI("nearest keyframe is at %lld us (%.2f secs)", actualSeekTimeUs, actualSeekTimeUs / 1E6); } @@ -733,7 +733,7 @@ status_t Harness::testSeek( status_t Harness::test( const char *componentName, const char *componentRole) { printf("testing %s [%s] ... ", componentName, componentRole); - LOGI("testing %s [%s].", componentName, componentRole); + ALOGI("testing %s [%s].", componentName, componentRole); status_t err1 = testStateTransitions(componentName, componentRole); status_t err2 = testSeek(componentName, componentRole); diff --git a/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp b/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp index 11d9c22..b0c7007 100644 --- a/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp +++ b/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp @@ -196,7 +196,7 @@ static status_t parseAudioSpecificConfig(ABitReader *bits, sp<ABuffer> *asc) { unsigned syncExtensionType = bits->getBits(11); if (syncExtensionType == 0x2b7) { - LOGI("found syncExtension"); + ALOGI("found syncExtension"); CHECK_EQ(parseAudioObjectType(bits, &extensionAudioObjectType), (status_t)OK); @@ -217,7 +217,7 @@ static status_t parseAudioSpecificConfig(ABitReader *bits, sp<ABuffer> *asc) { // Apparently an extension is always considered an even // multiple of 8 bits long. - LOGI("Skipping %d bits after sync extension", + ALOGI("Skipping %d bits after sync extension", 8 - (numBitsInExtension & 7)); bits->skipBits(8 - (numBitsInExtension & 7)); @@ -424,7 +424,7 @@ sp<ABuffer> AMPEG4AudioAssembler::removeLATMFraming(const sp<ABuffer> &buffer) { } if (offset < buffer->size()) { - LOGI("ignoring %d bytes of trailing data", buffer->size() - offset); + ALOGI("ignoring %d bytes of trailing data", buffer->size() - offset); } CHECK_LE(offset, buffer->size()); diff --git a/media/libstagefright/rtsp/APacketSource.cpp b/media/libstagefright/rtsp/APacketSource.cpp index 3f4cdb5..6cf1301 100644 --- a/media/libstagefright/rtsp/APacketSource.cpp +++ b/media/libstagefright/rtsp/APacketSource.cpp @@ -193,7 +193,7 @@ static sp<ABuffer> MakeAVCCodecSpecificData( if (i == 0) { FindAVCDimensions(nal, width, height); - LOGI("dimensions %dx%d", *width, *height); + ALOGI("dimensions %dx%d", *width, *height); } } @@ -371,7 +371,7 @@ static sp<ABuffer> MakeMPEG4VideoCodecSpecificData( return NULL; } - LOGI("VOL dimensions = %dx%d", *width, *height); + ALOGI("VOL dimensions = %dx%d", *width, *height); size_t len1 = config->size() + GetSizeWidth(config->size()) + 1; size_t len2 = len1 + GetSizeWidth(len1) + 1 + 13; diff --git a/media/libstagefright/rtsp/ARTPConnection.cpp b/media/libstagefright/rtsp/ARTPConnection.cpp index c5d8740..853ea14 100644 --- a/media/libstagefright/rtsp/ARTPConnection.cpp +++ b/media/libstagefright/rtsp/ARTPConnection.cpp @@ -396,7 +396,7 @@ status_t ARTPConnection::receive(StreamInfo *s, bool receiveRTP) { buffer->setRange(0, nbytes); - // LOGI("received %d bytes.", buffer->size()); + // ALOGI("received %d bytes.", buffer->size()); status_t err; if (receiveRTP) { @@ -606,7 +606,7 @@ status_t ARTPConnection::parseSR( uint32_t rtpTime = u32at(&data[16]); #if 0 - LOGI("XXX timeUpdate: ssrc=0x%08x, rtpTime %u == ntpTime %.3f", + ALOGI("XXX timeUpdate: ssrc=0x%08x, rtpTime %u == ntpTime %.3f", id, rtpTime, (ntpTime >> 32) + (double)(ntpTime & 0xffffffff) / (1ll << 32)); diff --git a/media/libstagefright/rtsp/ARTPSession.cpp b/media/libstagefright/rtsp/ARTPSession.cpp index c6bcb12..5783beb 100644 --- a/media/libstagefright/rtsp/ARTPSession.cpp +++ b/media/libstagefright/rtsp/ARTPSession.cpp @@ -159,7 +159,7 @@ void ARTPSession::onMessageReceived(const sp<AMessage> &msg) { printf("access unit complete size=%d\tntp-time=0x%016llx\n", accessUnit->size(), ntpTime); #else - LOGI("access unit complete, size=%d, ntp-time=%llu", + ALOGI("access unit complete, size=%d, ntp-time=%llu", accessUnit->size(), ntpTime); hexdump(accessUnit->data(), accessUnit->size()); #endif @@ -170,7 +170,7 @@ void ARTPSession::onMessageReceived(const sp<AMessage> &msg) { CHECK(!memcmp("\x00\x00\x00\x01", accessUnit->data(), 4)); unsigned x = accessUnit->data()[4]; - LOGI("access unit complete: nalType=0x%02x, nalRefIdc=0x%02x", + ALOGI("access unit complete: nalType=0x%02x, nalRefIdc=0x%02x", x & 0x1f, (x & 0x60) >> 5); #endif @@ -181,7 +181,7 @@ void ARTPSession::onMessageReceived(const sp<AMessage> &msg) { int32_t damaged; if (accessUnit->meta()->findInt32("damaged", &damaged) && damaged != 0) { - LOGI("ignoring damaged AU"); + ALOGI("ignoring damaged AU"); } else #endif { diff --git a/media/libstagefright/rtsp/ARTPWriter.cpp b/media/libstagefright/rtsp/ARTPWriter.cpp index b602511..0d07043 100644 --- a/media/libstagefright/rtsp/ARTPWriter.cpp +++ b/media/libstagefright/rtsp/ARTPWriter.cpp @@ -269,7 +269,7 @@ void ARTPWriter::onRead(const sp<AMessage> &msg) { status_t err = mSource->read(&mediaBuf); if (err != OK) { - LOGI("reached EOS."); + ALOGI("reached EOS."); Mutex::Autolock autoLock(mLock); mFlags |= kFlagEOS; @@ -520,7 +520,7 @@ void ARTPWriter::dumpSessionDesc() { sdp.append("a=fmtp:" PT_STR " octed-align\r\n"); } - LOGI("%s", sdp.c_str()); + ALOGI("%s", sdp.c_str()); } void ARTPWriter::makeH264SPropParamSets(MediaBuffer *buffer) { diff --git a/media/libstagefright/rtsp/ARTSPConnection.cpp b/media/libstagefright/rtsp/ARTSPConnection.cpp index d8107bc..12cca13 100644 --- a/media/libstagefright/rtsp/ARTSPConnection.cpp +++ b/media/libstagefright/rtsp/ARTSPConnection.cpp @@ -624,7 +624,7 @@ bool ARTSPConnection::receiveRTSPReponse() { sp<ARTSPResponse> response = new ARTSPResponse; response->mStatusLine = statusLine; - LOGI("status: %s", response->mStatusLine.c_str()); + ALOGI("status: %s", response->mStatusLine.c_str()); ssize_t space1 = response->mStatusLine.find(" "); if (space1 < 0) { @@ -740,7 +740,7 @@ bool ARTSPConnection::receiveRTSPReponse() { msg->setMessage("reply", reply); msg->setString("request", request.c_str(), request.size()); - LOGI("re-sending request with authentication headers..."); + ALOGI("re-sending request with authentication headers..."); onSendRequest(msg); return true; diff --git a/media/libstagefright/rtsp/ASessionDescription.cpp b/media/libstagefright/rtsp/ASessionDescription.cpp index 56fdd9d..a9b3330 100644 --- a/media/libstagefright/rtsp/ASessionDescription.cpp +++ b/media/libstagefright/rtsp/ASessionDescription.cpp @@ -80,7 +80,7 @@ bool ASessionDescription::parse(const void *data, size_t size) { return false; } - LOGI("%s", line.c_str()); + ALOGI("%s", line.c_str()); switch (line.c_str()[0]) { case 'v': diff --git a/media/libstagefright/rtsp/MyHandler.h b/media/libstagefright/rtsp/MyHandler.h index 21ef298..53691d1 100644 --- a/media/libstagefright/rtsp/MyHandler.h +++ b/media/libstagefright/rtsp/MyHandler.h @@ -155,7 +155,7 @@ struct MyHandler : public AHandler { mSessionURL.append(StringPrintf("%u", port)); mSessionURL.append(path); - LOGI("rewritten session url: '%s'", mSessionURL.c_str()); + ALOGI("rewritten session url: '%s'", mSessionURL.c_str()); } mSessionHost = host; @@ -283,7 +283,7 @@ struct MyHandler : public AHandler { if (!GetAttribute(transport.c_str(), "server_port", &server_port)) { - LOGI("Missing 'server_port' field in Transport response."); + ALOGI("Missing 'server_port' field in Transport response."); return false; } @@ -354,7 +354,7 @@ struct MyHandler : public AHandler { int32_t result; CHECK(msg->findInt32("result", &result)); - LOGI("connection request completed with result %d (%s)", + ALOGI("connection request completed with result %d (%s)", result, strerror(-result)); if (result == OK) { @@ -392,7 +392,7 @@ struct MyHandler : public AHandler { int32_t result; CHECK(msg->findInt32("result", &result)); - LOGI("DESCRIBE completed with result %d (%s)", + ALOGI("DESCRIBE completed with result %d (%s)", result, strerror(-result)); if (result == OK) { @@ -499,7 +499,7 @@ struct MyHandler : public AHandler { int32_t result; CHECK(msg->findInt32("result", &result)); - LOGI("SETUP(%d) completed with result %d (%s)", + ALOGI("SETUP(%d) completed with result %d (%s)", index, result, strerror(-result)); if (result == OK) { @@ -540,7 +540,7 @@ struct MyHandler : public AHandler { } else { mKeepAliveTimeoutUs = timeoutSecs * 1000000ll; - LOGI("server specified timeout of %lu secs.", + ALOGI("server specified timeout of %lu secs.", timeoutSecs); } } @@ -625,7 +625,7 @@ struct MyHandler : public AHandler { int32_t result; CHECK(msg->findInt32("result", &result)); - LOGI("PLAY completed with result %d (%s)", + ALOGI("PLAY completed with result %d (%s)", result, strerror(-result)); if (result == OK) { @@ -682,7 +682,7 @@ struct MyHandler : public AHandler { int32_t result; CHECK(msg->findInt32("result", &result)); - LOGI("OPTIONS completed with result %d (%s)", + ALOGI("OPTIONS completed with result %d (%s)", result, strerror(-result)); int32_t generation; @@ -759,7 +759,7 @@ struct MyHandler : public AHandler { int32_t result; CHECK(msg->findInt32("result", &result)); - LOGI("TEARDOWN completed with result %d (%s)", + ALOGI("TEARDOWN completed with result %d (%s)", result, strerror(-result)); sp<AMessage> reply = new AMessage('disc', id()); @@ -793,11 +793,11 @@ struct MyHandler : public AHandler { if (mNumAccessUnitsReceived == 0) { #if 1 - LOGI("stream ended? aborting."); + ALOGI("stream ended? aborting."); (new AMessage('abor', id()))->post(); break; #else - LOGI("haven't seen an AU in a looong time."); + ALOGI("haven't seen an AU in a looong time."); #endif } @@ -848,7 +848,7 @@ struct MyHandler : public AHandler { int32_t eos; if (msg->findInt32("eos", &eos)) { - LOGI("received BYE on track index %d", trackIndex); + ALOGI("received BYE on track index %d", trackIndex); #if 0 track->mPacketSource->signalEOS(ERROR_END_OF_STREAM); #endif @@ -961,7 +961,7 @@ struct MyHandler : public AHandler { int32_t result; CHECK(msg->findInt32("result", &result)); - LOGI("PLAY completed with result %d (%s)", + ALOGI("PLAY completed with result %d (%s)", result, strerror(-result)); mCheckPending = false; @@ -983,7 +983,7 @@ struct MyHandler : public AHandler { ALOGV("rtp-info: %s", response->mHeaders.valueAt(i).c_str()); - LOGI("seek completed."); + ALOGI("seek completed."); } } @@ -1101,7 +1101,7 @@ struct MyHandler : public AHandler { if (!ASessionDescription::parseNTPRange(val.c_str(), &npt1, &npt2)) { // This is a live stream and therefore not seekable. - LOGI("This is a live stream"); + ALOGI("This is a live stream"); return; } diff --git a/media/libstagefright/rtsp/UDPPusher.cpp b/media/libstagefright/rtsp/UDPPusher.cpp index 576b3ca..6a4c87b 100644 --- a/media/libstagefright/rtsp/UDPPusher.cpp +++ b/media/libstagefright/rtsp/UDPPusher.cpp @@ -71,7 +71,7 @@ void UDPPusher::start() { bool UDPPusher::onPush() { uint32_t length; if (fread(&length, 1, sizeof(length), mFile) < sizeof(length)) { - LOGI("No more data to push."); + ALOGI("No more data to push."); return false; } @@ -93,7 +93,7 @@ bool UDPPusher::onPush() { uint32_t timeMs; if (fread(&timeMs, 1, sizeof(timeMs), mFile) < sizeof(timeMs)) { - LOGI("No more data to push."); + ALOGI("No more data to push."); return false; } @@ -113,7 +113,7 @@ void UDPPusher::onMessageReceived(const sp<AMessage> &msg) { case kWhatPush: { if (!onPush() && !(ntohs(mRemoteAddr.sin_port) & 1)) { - LOGI("emulating BYE packet"); + ALOGI("emulating BYE packet"); sp<ABuffer> buffer = new ABuffer(8); uint8_t *data = buffer->data(); diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp index 7094cfa..f078192 100644 --- a/media/mediaserver/main_mediaserver.cpp +++ b/media/mediaserver/main_mediaserver.cpp @@ -37,7 +37,7 @@ int main(int argc, char** argv) { sp<ProcessState> proc(ProcessState::self()); sp<IServiceManager> sm = defaultServiceManager(); - LOGI("ServiceManager: %p", sm.get()); + ALOGI("ServiceManager: %p", sm.get()); AudioFlinger::instantiate(); MediaPlayerService::instantiate(); CameraService::instantiate(); diff --git a/media/mtp/MtpDevice.cpp b/media/mtp/MtpDevice.cpp index b370225..2fc6ba8 100644 --- a/media/mtp/MtpDevice.cpp +++ b/media/mtp/MtpDevice.cpp @@ -232,7 +232,7 @@ void MtpDevice::print() { mDeviceInfo->print(); if (mDeviceInfo->mDeviceProperties) { - LOGI("***** DEVICE PROPERTIES *****\n"); + ALOGI("***** DEVICE PROPERTIES *****\n"); int count = mDeviceInfo->mDeviceProperties->size(); for (int i = 0; i < count; i++) { MtpDeviceProperty propCode = (*mDeviceInfo->mDeviceProperties)[i]; @@ -246,11 +246,11 @@ void MtpDevice::print() { } if (mDeviceInfo->mPlaybackFormats) { - LOGI("***** OBJECT PROPERTIES *****\n"); + ALOGI("***** OBJECT PROPERTIES *****\n"); int count = mDeviceInfo->mPlaybackFormats->size(); for (int i = 0; i < count; i++) { MtpObjectFormat format = (*mDeviceInfo->mPlaybackFormats)[i]; - LOGI("*** FORMAT: %s\n", MtpDebug::getFormatCodeName(format)); + ALOGI("*** FORMAT: %s\n", MtpDebug::getFormatCodeName(format)); MtpObjectPropertyList* props = getObjectPropsSupported(format); if (props) { for (int j = 0; j < props->size(); j++) { diff --git a/media/mtp/MtpProperty.cpp b/media/mtp/MtpProperty.cpp index 8016c35..d06f214 100644 --- a/media/mtp/MtpProperty.cpp +++ b/media/mtp/MtpProperty.cpp @@ -320,18 +320,18 @@ void MtpProperty::print() { MtpString buffer; bool deviceProp = isDeviceProperty(); if (deviceProp) - LOGI(" %s (%04X)", MtpDebug::getDevicePropCodeName(mCode), mCode); + ALOGI(" %s (%04X)", MtpDebug::getDevicePropCodeName(mCode), mCode); else - LOGI(" %s (%04X)", MtpDebug::getObjectPropCodeName(mCode), mCode); - LOGI(" type %04X", mType); - LOGI(" writeable %s", (mWriteable ? "true" : "false")); + ALOGI(" %s (%04X)", MtpDebug::getObjectPropCodeName(mCode), mCode); + ALOGI(" type %04X", mType); + ALOGI(" writeable %s", (mWriteable ? "true" : "false")); buffer = " default value: "; print(mDefaultValue, buffer); - LOGI("%s", (const char *)buffer); + ALOGI("%s", (const char *)buffer); if (deviceProp) { buffer = " current value: "; print(mCurrentValue, buffer); - LOGI("%s", (const char *)buffer); + ALOGI("%s", (const char *)buffer); } switch (mFormFlag) { case kFormNone: @@ -344,7 +344,7 @@ void MtpProperty::print() { buffer += ", "; print(mStepSize, buffer); buffer += ")"; - LOGI("%s", (const char *)buffer); + ALOGI("%s", (const char *)buffer); break; case kFormEnum: buffer = " Enum { "; @@ -353,13 +353,13 @@ void MtpProperty::print() { buffer += " "; } buffer += "}"; - LOGI("%s", (const char *)buffer); + ALOGI("%s", (const char *)buffer); break; case kFormDateTime: - LOGI(" DateTime\n"); + ALOGI(" DateTime\n"); break; default: - LOGI(" form %d\n", mFormFlag); + ALOGI(" form %d\n", mFormFlag); break; } } diff --git a/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp b/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp index 209e71c..2735a55 100644 --- a/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp +++ b/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp @@ -113,7 +113,7 @@ bool OmxJpegImageDecoder::onDecode(SkStream* stream, // mode == DecodePixels if (!this->allocPixelRef(bm, NULL)) { - LOGI("Cannot allocPixelRef()!"); + ALOGI("Cannot allocPixelRef()!"); return false; } diff --git a/native/android/storage_manager.cpp b/native/android/storage_manager.cpp index a4233e7..5e05045 100644 --- a/native/android/storage_manager.cpp +++ b/native/android/storage_manager.cpp @@ -121,7 +121,7 @@ public: target->cb(filename, state, target->data); delete target; } else { - LOGI("Didn't find the callback handler for: %s\n", filename); + ALOGI("Didn't find the callback handler for: %s\n", filename); } } diff --git a/opengl/tests/gl2_jni/jni/gl_code.cpp b/opengl/tests/gl2_jni/jni/gl_code.cpp index c2fabe6..f7e7f8d 100644 --- a/opengl/tests/gl2_jni/jni/gl_code.cpp +++ b/opengl/tests/gl2_jni/jni/gl_code.cpp @@ -14,13 +14,13 @@ static void printGLString(const char *name, GLenum s) { const char *v = (const char *) glGetString(s); - LOGI("GL %s = %s\n", name, v); + ALOGI("GL %s = %s\n", name, v); } static void checkGlError(const char* op) { for (GLint error = glGetError(); error; error = glGetError()) { - LOGI("after %s() glError (0x%x)\n", op, error); + ALOGI("after %s() glError (0x%x)\n", op, error); } } @@ -107,7 +107,7 @@ bool setupGraphics(int w, int h) { printGLString("Renderer", GL_RENDERER); printGLString("Extensions", GL_EXTENSIONS); - LOGI("setupGraphics(%d, %d)", w, h); + ALOGI("setupGraphics(%d, %d)", w, h); gProgram = createProgram(gVertexShader, gFragmentShader); if (!gProgram) { LOGE("Could not create program."); @@ -115,7 +115,7 @@ bool setupGraphics(int w, int h) { } gvPositionHandle = glGetAttribLocation(gProgram, "vPosition"); checkGlError("glGetAttribLocation"); - LOGI("glGetAttribLocation(\"vPosition\") = %d\n", + ALOGI("glGetAttribLocation(\"vPosition\") = %d\n", gvPositionHandle); glViewport(0, 0, w, h); diff --git a/opengl/tests/gl_jni/jni/gl_code.cpp b/opengl/tests/gl_jni/jni/gl_code.cpp index ef66841..cf86020 100644 --- a/opengl/tests/gl_jni/jni/gl_code.cpp +++ b/opengl/tests/gl_jni/jni/gl_code.cpp @@ -18,7 +18,7 @@ GLfloat background; static void printGLString(const char *name, GLenum s) { const char *v = (const char *) glGetString(s); - LOGI("GL %s = %s\n", name, v); + ALOGI("GL %s = %s\n", name, v); } static void gluLookAt(float eyeX, float eyeY, float eyeZ, diff --git a/opengl/tests/gl_perf/fill_common.cpp b/opengl/tests/gl_perf/fill_common.cpp index a069f67..2a425f7 100644 --- a/opengl/tests/gl_perf/fill_common.cpp +++ b/opengl/tests/gl_perf/fill_common.cpp @@ -132,7 +132,7 @@ static void endTimer(int count) { } else { printf("%s, %f, %f\n", gCurrentTestName, mpps, dc60); } - LOGI("%s, %f, %f\r\n", gCurrentTestName, mpps, dc60); + ALOGI("%s, %f, %f\r\n", gCurrentTestName, mpps, dc60); } diff --git a/opengl/tests/gl_perfapp/jni/gl_code.cpp b/opengl/tests/gl_perfapp/jni/gl_code.cpp index f993371..c8e4ad5 100644 --- a/opengl/tests/gl_perfapp/jni/gl_code.cpp +++ b/opengl/tests/gl_perfapp/jni/gl_code.cpp @@ -43,7 +43,7 @@ void doTest() { int texSize = ((stateClock >> 1) & 0x1) + 1; if (testNum >= gFragmentTestCount) { - LOGI("done\n"); + ALOGI("done\n"); if (fOut) { fclose(fOut); fOut = NULL; @@ -52,7 +52,7 @@ void doTest() { return; } - // LOGI("doTest %d %d %d\n", texCount, extraMath, testSubState); + // ALOGI("doTest %d %d %d\n", texCount, extraMath, testSubState); // for (uint32_t num = 0; num < gFragmentTestCount; num++) { doSingleTest(testNum, texSize); @@ -74,17 +74,17 @@ JNIEXPORT void JNICALL Java_com_android_glperf_GLPerfLib_init(JNIEnv * env, jobj genTextures(); const char* fileName = "/sdcard/glperf.csv"; if (fOut != NULL) { - LOGI("Closing partially written output.n"); + ALOGI("Closing partially written output.n"); fclose(fOut); fOut = NULL; } - LOGI("Writing to: %s\n",fileName); + ALOGI("Writing to: %s\n",fileName); fOut = fopen(fileName, "w"); if (fOut == NULL) { LOGE("Could not open: %s\n", fileName); } - LOGI("\nvarColor, texCount, modulate, extraMath, texSize, blend, Mpps, DC60\n"); + ALOGI("\nvarColor, texCount, modulate, extraMath, texSize, blend, Mpps, DC60\n"); if (fOut) fprintf(fOut,"varColor, texCount, modulate, extraMath, texSize, blend, Mpps, DC60\r\n"); } } diff --git a/opengl/tests/gldual/jni/gl_code.cpp b/opengl/tests/gldual/jni/gl_code.cpp index f1f0a1f..7ba0571 100644 --- a/opengl/tests/gldual/jni/gl_code.cpp +++ b/opengl/tests/gldual/jni/gl_code.cpp @@ -14,13 +14,13 @@ static void printGLString(const char *name, GLenum s) { const char *v = (const char *) glGetString(s); - LOGI("GL %s = %s\n", name, v); + ALOGI("GL %s = %s\n", name, v); } static void checkGlError(const char* op) { for (GLint error = glGetError(); error; error = glGetError()) { - LOGI("after %s() glError (0x%x)\n", op, error); + ALOGI("after %s() glError (0x%x)\n", op, error); } } @@ -107,7 +107,7 @@ bool setupGraphics(int w, int h) { printGLString("Renderer", GL_RENDERER); printGLString("Extensions", GL_EXTENSIONS); - LOGI("setupGraphics(%d, %d)", w, h); + ALOGI("setupGraphics(%d, %d)", w, h); gProgram = createProgram(gVertexShader, gFragmentShader); if (!gProgram) { LOGE("Could not create program."); @@ -115,7 +115,7 @@ bool setupGraphics(int w, int h) { } gvPositionHandle = glGetAttribLocation(gProgram, "vPosition"); checkGlError("glGetAttribLocation"); - LOGI("glGetAttribLocation(\"vPosition\") = %d\n", + ALOGI("glGetAttribLocation(\"vPosition\") = %d\n", gvPositionHandle); glViewport(0, 0, w, h); diff --git a/packages/DefaultContainerService/jni/com_android_defcontainer_MeasurementUtils.cpp b/packages/DefaultContainerService/jni/com_android_defcontainer_MeasurementUtils.cpp index 6579f95..7390bb7 100644 --- a/packages/DefaultContainerService/jni/com_android_defcontainer_MeasurementUtils.cpp +++ b/packages/DefaultContainerService/jni/com_android_defcontainer_MeasurementUtils.cpp @@ -39,7 +39,7 @@ static jlong native_measureDirectory(JNIEnv* env, jobject clazz, jstring directo int dirfd = open(path, O_DIRECTORY, O_RDONLY); if (dirfd < 0) { - LOGI("error opening: %s: %s", path, strerror(errno)); + ALOGI("error opening: %s: %s", path, strerror(errno)); } else { ret = calculate_dir_size(dirfd); close(dirfd); diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 54a306f..ed097b8 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -180,13 +180,13 @@ void AudioFlinger::onFirstRef() if (rc) continue; - LOGI("Loaded %s audio interface from %s (%s)", audio_interfaces[i], + ALOGI("Loaded %s audio interface from %s (%s)", audio_interfaces[i], mod->name, mod->id); mAudioHwDevs.push(dev); if (!mPrimaryHardwareDev) { mPrimaryHardwareDev = dev; - LOGI("Using '%s' (%s.%s) as the primary audio interface", + ALOGI("Using '%s' (%s.%s) as the primary audio interface", mod->name, mod->id, audio_interfaces[i]); } } @@ -1463,7 +1463,7 @@ status_t AudioFlinger::PlaybackThread::readyToRun() { status_t status = initCheck(); if (status == NO_ERROR) { - LOGI("AudioFlinger's thread %p ready to run", this); + ALOGI("AudioFlinger's thread %p ready to run", this); } else { LOGE("No working audio driver found."); } @@ -1889,7 +1889,7 @@ bool AudioFlinger::MixerThread::threadLoop() double minimum = stats.minimum(); double maximum = stats.maximum(); cpu.resetStatistics(); - LOGI("CPU usage over past %.1f secs (%u mixer loops at %.1f mean ms per loop):\n us per mix loop: mean=%.0f stddev=%.0f min=%.0f max=%.0f\n %% of wall: mean=%.1f stddev=%.1f min=%.1f max=%.1f", + ALOGI("CPU usage over past %.1f secs (%u mixer loops at %.1f mean ms per loop):\n us per mix loop: mean=%.0f stddev=%.0f min=%.0f max=%.0f\n %% of wall: mean=%.1f stddev=%.1f min=%.1f max=%.1f", elapsed * .000000001, n, perLoop * .000001, mean * .001, stddev * .001, diff --git a/services/audioflinger/AudioPolicyService.cpp b/services/audioflinger/AudioPolicyService.cpp index 840d70d..32600b1 100644 --- a/services/audioflinger/AudioPolicyService.cpp +++ b/services/audioflinger/AudioPolicyService.cpp @@ -103,7 +103,7 @@ AudioPolicyService::AudioPolicyService() forced_val = strtol(value, NULL, 0); mpAudioPolicy->set_can_mute_enforced_audible(mpAudioPolicy, !forced_val); - LOGI("Loaded audio policy from %s (%s)", module->name, module->id); + ALOGI("Loaded audio policy from %s (%s)", module->name, module->id); // load audio pre processing modules if (access(AUDIO_EFFECT_VENDOR_CONFIG_FILE, R_OK) == 0) { diff --git a/services/camera/libcameraservice/CameraHardwareInterface.h b/services/camera/libcameraservice/CameraHardwareInterface.h index 658e25e..44b9de8 100644 --- a/services/camera/libcameraservice/CameraHardwareInterface.h +++ b/services/camera/libcameraservice/CameraHardwareInterface.h @@ -88,7 +88,7 @@ public: ~CameraHardwareInterface() { - LOGI("Destroying camera %s", mName.string()); + ALOGI("Destroying camera %s", mName.string()); if(mDevice) { int rc = mDevice->common.close(&mDevice->common); if (rc != OK) @@ -98,7 +98,7 @@ public: status_t initialize(hw_module_t *module) { - LOGI("Opening camera %s", mName.string()); + ALOGI("Opening camera %s", mName.string()); int rc = module->methods->open(module, mName.string(), (hw_device_t **)&mDevice); if (rc != OK) { diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index e2905fe..a5f8405 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -73,7 +73,7 @@ static CameraService *gCameraService; CameraService::CameraService() :mSoundRef(0), mModule(0) { - LOGI("CameraService started (pid=%d)", getpid()); + ALOGI("CameraService started (pid=%d)", getpid()); gCameraService = this; } @@ -163,7 +163,7 @@ sp<ICamera> CameraService::connect( property_get("sys.secpolicy.camera.disabled", value, "0"); if (strcmp(value, "1") == 0) { // Camera is disabled by DevicePolicyManager. - LOGI("Camera is disabled. connect X (pid %d) rejected", callingPid); + ALOGI("Camera is disabled. connect X (pid %d) rejected", callingPid); return NULL; } diff --git a/services/input/EventHub.cpp b/services/input/EventHub.cpp index f179208..85ff964 100644 --- a/services/input/EventHub.cpp +++ b/services/input/EventHub.cpp @@ -551,7 +551,7 @@ size_t EventHub::getEvents(int timeoutMillis, RawEvent* buffer, size_t bufferSiz if (mNeedToReopenDevices) { mNeedToReopenDevices = false; - LOGI("Reopening all input devices due to a configuration change."); + ALOGI("Reopening all input devices due to a configuration change."); closeAllDevicesLocked(); mNeedToScanDevices = true; @@ -865,7 +865,7 @@ status_t EventHub::openDeviceLocked(const char *devicePath) { for (size_t i = 0; i < mExcludedDevices.size(); i++) { const String8& item = mExcludedDevices.itemAt(i); if (identifier.name == item) { - LOGI("ignoring event id %s driver %s\n", devicePath, item.string()); + ALOGI("ignoring event id %s driver %s\n", devicePath, item.string()); close(fd); return -1; } @@ -919,16 +919,16 @@ status_t EventHub::openDeviceLocked(const char *devicePath) { Device* device = new Device(fd, deviceId, String8(devicePath), identifier); #if 0 - LOGI("add device %d: %s\n", deviceId, devicePath); - LOGI(" bus: %04x\n" + ALOGI("add device %d: %s\n", deviceId, devicePath); + ALOGI(" bus: %04x\n" " vendor %04x\n" " product %04x\n" " version %04x\n", identifier.bus, identifier.vendor, identifier.product, identifier.version); - LOGI(" name: \"%s\"\n", identifier.name.string()); - LOGI(" location: \"%s\"\n", identifier.location.string()); - LOGI(" unique id: \"%s\"\n", identifier.uniqueId.string()); - LOGI(" driver: v%d.%d.%d\n", + ALOGI(" name: \"%s\"\n", identifier.name.string()); + ALOGI(" location: \"%s\"\n", identifier.location.string()); + ALOGI(" unique id: \"%s\"\n", identifier.uniqueId.string()); + ALOGI(" driver: v%d.%d.%d\n", driverVersion >> 16, (driverVersion >> 8) & 0xff, driverVersion & 0xff); #endif @@ -1077,7 +1077,7 @@ status_t EventHub::openDeviceLocked(const char *devicePath) { return -1; } - LOGI("New device: id=%d, fd=%d, path='%s', name='%s', classes=0x%x, " + ALOGI("New device: id=%d, fd=%d, path='%s', name='%s', classes=0x%x, " "configuration='%s', keyLayout='%s', keyCharacterMap='%s', builtinKeyboard=%s", deviceId, fd, devicePath, device->identifier.name.string(), device->classes, @@ -1170,7 +1170,7 @@ void EventHub::closeAllDevicesLocked() { } void EventHub::closeDeviceLocked(Device* device) { - LOGI("Removed device: path=%s name=%s id=%d fd=%d classes=0x%x\n", + ALOGI("Removed device: path=%s name=%s id=%d fd=%d classes=0x%x\n", device->path.string(), device->identifier.name.string(), device->id, device->fd, device->classes); @@ -1202,7 +1202,7 @@ void EventHub::closeDeviceLocked(Device* device) { // Unlink the device from the opening devices list then delete it. // We don't need to tell the client that the device was closed because // it does not even know it was opened in the first place. - LOGI("Device %s was immediately closed after opening.", device->path.string()); + ALOGI("Device %s was immediately closed after opening.", device->path.string()); if (pred) { pred->next = device->next; } else { @@ -1248,7 +1248,7 @@ status_t EventHub::readNotifyLocked() { if(event->mask & IN_CREATE) { openDeviceLocked(devname); } else { - LOGI("Removing device '%s' due to inotify event\n", devname); + ALOGI("Removing device '%s' due to inotify event\n", devname); closeDeviceByPathLocked(devname); } } diff --git a/services/input/InputDispatcher.cpp b/services/input/InputDispatcher.cpp index 7320406..0379d7e 100644 --- a/services/input/InputDispatcher.cpp +++ b/services/input/InputDispatcher.cpp @@ -572,21 +572,21 @@ void InputDispatcher::dropInboundEventLocked(EventEntry* entry, DropReason dropR reason = "inbound event was dropped because the policy consumed it"; break; case DROP_REASON_DISABLED: - LOGI("Dropped event because input dispatch is disabled."); + ALOGI("Dropped event because input dispatch is disabled."); reason = "inbound event was dropped because input dispatch is disabled"; break; case DROP_REASON_APP_SWITCH: - LOGI("Dropped event because of pending overdue app switch."); + ALOGI("Dropped event because of pending overdue app switch."); reason = "inbound event was dropped because of pending overdue app switch"; break; case DROP_REASON_BLOCKED: - LOGI("Dropped event because the current application is not responding and the user " + ALOGI("Dropped event because the current application is not responding and the user " "has started interacting with a different application."); reason = "inbound event was dropped because the current application is not responding " "and the user has started interacting with a different application"; break; case DROP_REASON_STALE: - LOGI("Dropped event because it is stale."); + ALOGI("Dropped event because it is stale."); reason = "inbound event was dropped because it is stale"; break; default: @@ -1190,7 +1190,7 @@ int32_t InputDispatcher::findFocusedWindowTargetsLocked(nsecs_t currentTime, goto Unresponsive; } - LOGI("Dropping event because there is no focused window or focused application."); + ALOGI("Dropping event because there is no focused window or focused application."); injectionResult = INPUT_EVENT_INJECTION_FAILED; goto Failed; } @@ -1409,7 +1409,7 @@ int32_t InputDispatcher::findTouchedWindowTargetsLocked(nsecs_t currentTime, goto Unresponsive; } - LOGI("Dropping event because there is no touched window or focused application."); + ALOGI("Dropping event because there is no touched window or focused application."); injectionResult = INPUT_EVENT_INJECTION_FAILED; goto Failed; } @@ -3782,7 +3782,7 @@ void InputDispatcher::onANRLocked( nsecs_t currentTime, const sp<InputApplicationHandle>& applicationHandle, const sp<InputWindowHandle>& windowHandle, nsecs_t eventTime, nsecs_t waitStartTime) { - LOGI("Application is not responding: %s. " + ALOGI("Application is not responding: %s. " "%01.1fms since event, %01.1fms since wait started", getApplicationWindowLabelLocked(applicationHandle, windowHandle).string(), (currentTime - eventTime) / 1000000.0, diff --git a/services/input/InputReader.cpp b/services/input/InputReader.cpp index 50f26da..bf398f7 100644 --- a/services/input/InputReader.cpp +++ b/services/input/InputReader.cpp @@ -349,9 +349,9 @@ void InputReader::addDeviceLocked(nsecs_t when, int32_t deviceId) { device->reset(when); if (device->isIgnored()) { - LOGI("Device added: id=%d, name='%s' (ignored non-input device)", deviceId, name.string()); + ALOGI("Device added: id=%d, name='%s' (ignored non-input device)", deviceId, name.string()); } else { - LOGI("Device added: id=%d, name='%s', sources=0x%08x", deviceId, name.string(), + ALOGI("Device added: id=%d, name='%s', sources=0x%08x", deviceId, name.string(), device->getSources()); } @@ -377,10 +377,10 @@ void InputReader::removeDeviceLocked(nsecs_t when, int32_t deviceId) { } if (device->isIgnored()) { - LOGI("Device removed: id=%d, name='%s' (ignored non-input device)", + ALOGI("Device removed: id=%d, name='%s' (ignored non-input device)", device->getId(), device->getName().string()); } else { - LOGI("Device removed: id=%d, name='%s', sources=0x%08x", + ALOGI("Device removed: id=%d, name='%s', sources=0x%08x", device->getId(), device->getName().string(), device->getSources()); } @@ -485,7 +485,7 @@ void InputReader::refreshConfigurationLocked(uint32_t changes) { mEventHub->setExcludedDevices(mConfig.excludedDeviceNames); if (changes) { - LOGI("Reconfiguring input devices. changes=0x%08x", changes); + ALOGI("Reconfiguring input devices. changes=0x%08x", changes); nsecs_t now = systemTime(SYSTEM_TIME_MONOTONIC); if (changes & InputReaderConfiguration::CHANGE_MUST_REOPEN) { @@ -547,7 +547,7 @@ void InputReader::disableVirtualKeysUntilLocked(nsecs_t time) { bool InputReader::shouldDropVirtualKeyLocked(nsecs_t now, InputDevice* device, int32_t keyCode, int32_t scanCode) { if (now < mDisableVirtualKeysTimeout) { - LOGI("Dropping virtual key from device %s because virtual keys are " + ALOGI("Dropping virtual key from device %s because virtual keys are " "temporarily disabled for the next %0.3fms. keyCode=%d, scanCode=%d", device->getName().string(), (mDisableVirtualKeysTimeout - now) * 0.000001, @@ -952,7 +952,7 @@ void InputDevice::process(const RawEvent* rawEvents, size_t count) { #endif } } else if (rawEvent->type == EV_SYN && rawEvent->scanCode == SYN_DROPPED) { - LOGI("Detected input event buffer overrun for device %s.", mName.string()); + ALOGI("Detected input event buffer overrun for device %s.", mName.string()); mDropUntilNextSync = true; reset(rawEvent->when); } else { @@ -1897,7 +1897,7 @@ void KeyboardInputMapper::processKey(nsecs_t when, bool down, int32_t keyCode, mKeyDowns.removeAt(size_t(keyDownIndex)); } else { // key was not actually down - LOGI("Dropping key up from device %s because the key was not down. " + ALOGI("Dropping key up from device %s because the key was not down. " "keyCode=%d, scanCode=%d", getDeviceName().string(), keyCode, scanCode); return; @@ -2658,7 +2658,7 @@ void TouchInputMapper::configureSurface(nsecs_t when, bool* outResetNeeded) { mParameters.associatedDisplayIsExternal, &mAssociatedDisplayWidth, &mAssociatedDisplayHeight, &mAssociatedDisplayOrientation)) { - LOGI(INDENT "Touch device '%s' could not query the properties of its associated " + ALOGI(INDENT "Touch device '%s' could not query the properties of its associated " "display %d. The device will be inoperable until the display size " "becomes available.", getDeviceName().string(), mParameters.associatedDisplayId); @@ -2704,7 +2704,7 @@ void TouchInputMapper::configureSurface(nsecs_t when, bool* outResetNeeded) { bool sizeChanged = mSurfaceWidth != width || mSurfaceHeight != height; if (sizeChanged || deviceModeChanged) { - LOGI("Device reconfigured: id=%d, name='%s', surface size is now %dx%d, mode is %d", + ALOGI("Device reconfigured: id=%d, name='%s', surface size is now %dx%d, mode is %d", getDeviceId(), getDeviceName().string(), width, height, mDeviceMode); mSurfaceWidth = width; @@ -5814,7 +5814,7 @@ void JoystickInputMapper::configure(nsecs_t when, // If there are too many axes, start dropping them. // Prefer to keep explicitly mapped axes. if (mAxes.size() > PointerCoords::MAX_AXES) { - LOGI("Joystick '%s' has %d axes but the framework only supports a maximum of %d.", + ALOGI("Joystick '%s' has %d axes but the framework only supports a maximum of %d.", getDeviceName().string(), mAxes.size(), PointerCoords::MAX_AXES); pruneAxes(true); pruneAxes(false); @@ -5835,7 +5835,7 @@ void JoystickInputMapper::configure(nsecs_t when, axis.axisInfo.axis = nextGenericAxisId; nextGenericAxisId += 1; } else { - LOGI("Ignoring joystick '%s' axis %d because all of the generic axis ids " + ALOGI("Ignoring joystick '%s' axis %d because all of the generic axis ids " "have already been assigned to other axes.", getDeviceName().string(), mAxes.keyAt(i)); mAxes.removeItemsAt(i--); @@ -5865,7 +5865,7 @@ void JoystickInputMapper::pruneAxes(bool ignoreExplicitlyMappedAxes) { if (ignoreExplicitlyMappedAxes && mAxes.valueAt(i).explicitlyMapped) { continue; } - LOGI("Discarding joystick '%s' axis %d because there are too many axes.", + ALOGI("Discarding joystick '%s' axis %d because there are too many axes.", getDeviceName().string(), mAxes.keyAt(i)); mAxes.removeItemsAt(i); } diff --git a/services/jni/com_android_server_InputManager.cpp b/services/jni/com_android_server_InputManager.cpp index 145f713..b8b5d77 100644 --- a/services/jni/com_android_server_InputManager.cpp +++ b/services/jni/com_android_server_InputManager.cpp @@ -686,7 +686,7 @@ void NativeInputManager::setPointerSpeed(int32_t speed) { return; } - LOGI("Setting pointer speed to %d.", speed); + ALOGI("Setting pointer speed to %d.", speed); mLocked.pointerSpeed = speed; } // release lock @@ -702,7 +702,7 @@ void NativeInputManager::setShowTouches(bool enabled) { return; } - LOGI("Setting show touches feature to %s.", enabled ? "enabled" : "disabled"); + ALOGI("Setting show touches feature to %s.", enabled ? "enabled" : "disabled"); mLocked.showTouches = enabled; } // release lock diff --git a/services/jni/com_android_server_VibratorService.cpp b/services/jni/com_android_server_VibratorService.cpp index 0912d43..2b3f74a 100644 --- a/services/jni/com_android_server_VibratorService.cpp +++ b/services/jni/com_android_server_VibratorService.cpp @@ -36,13 +36,13 @@ static jboolean vibratorExists(JNIEnv *env, jobject clazz) static void vibratorOn(JNIEnv *env, jobject clazz, jlong timeout_ms) { - // LOGI("vibratorOn\n"); + // ALOGI("vibratorOn\n"); vibrator_on(timeout_ms); } static void vibratorOff(JNIEnv *env, jobject clazz) { - // LOGI("vibratorOff\n"); + // ALOGI("vibratorOff\n"); vibrator_off(); } diff --git a/services/sensorservice/SensorInterface.cpp b/services/sensorservice/SensorInterface.cpp index be8eaff..468aa61 100644 --- a/services/sensorservice/SensorInterface.cpp +++ b/services/sensorservice/SensorInterface.cpp @@ -34,7 +34,7 @@ HardwareSensor::HardwareSensor(const sensor_t& sensor) : mSensorDevice(SensorDevice::getInstance()), mSensor(&sensor) { - LOGI("%s", sensor.name); + ALOGI("%s", sensor.name); } HardwareSensor::~HardwareSensor() { diff --git a/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp b/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp index f94d321..677cc16 100644 --- a/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp +++ b/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp @@ -284,22 +284,22 @@ void DisplayHardware::init(uint32_t dpy) glGetIntegerv(GL_MAX_TEXTURE_SIZE, &mMaxTextureSize); glGetIntegerv(GL_MAX_VIEWPORT_DIMS, mMaxViewportDims); - LOGI("EGL informations:"); - LOGI("# of configs : %d", numConfigs); - LOGI("vendor : %s", extensions.getEglVendor()); - LOGI("version : %s", extensions.getEglVersion()); - LOGI("extensions: %s", extensions.getEglExtension()); - LOGI("Client API: %s", eglQueryString(display, EGL_CLIENT_APIS)?:"Not Supported"); - LOGI("EGLSurface: %d-%d-%d-%d, config=%p", r, g, b, a, config); - - LOGI("OpenGL informations:"); - LOGI("vendor : %s", extensions.getVendor()); - LOGI("renderer : %s", extensions.getRenderer()); - LOGI("version : %s", extensions.getVersion()); - LOGI("extensions: %s", extensions.getExtension()); - LOGI("GL_MAX_TEXTURE_SIZE = %d", mMaxTextureSize); - LOGI("GL_MAX_VIEWPORT_DIMS = %d x %d", mMaxViewportDims[0], mMaxViewportDims[1]); - LOGI("flags = %08x", mFlags); + ALOGI("EGL informations:"); + ALOGI("# of configs : %d", numConfigs); + ALOGI("vendor : %s", extensions.getEglVendor()); + ALOGI("version : %s", extensions.getEglVersion()); + ALOGI("extensions: %s", extensions.getEglExtension()); + ALOGI("Client API: %s", eglQueryString(display, EGL_CLIENT_APIS)?:"Not Supported"); + ALOGI("EGLSurface: %d-%d-%d-%d, config=%p", r, g, b, a, config); + + ALOGI("OpenGL informations:"); + ALOGI("vendor : %s", extensions.getVendor()); + ALOGI("renderer : %s", extensions.getRenderer()); + ALOGI("version : %s", extensions.getVersion()); + ALOGI("extensions: %s", extensions.getExtension()); + ALOGI("GL_MAX_TEXTURE_SIZE = %d", mMaxTextureSize); + ALOGI("GL_MAX_VIEWPORT_DIMS = %d x %d", mMaxViewportDims[0], mMaxViewportDims[1]); + ALOGI("flags = %08x", mFlags); // Unbind the context from this thread eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 1519a89..cb2c5c3 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -106,7 +106,7 @@ SurfaceFlinger::SurfaceFlinger() void SurfaceFlinger::init() { - LOGI("SurfaceFlinger is starting"); + ALOGI("SurfaceFlinger is starting"); // debugging stuff... char value[PROPERTY_VALUE_MAX]; @@ -123,9 +123,9 @@ void SurfaceFlinger::init() DdmConnection::start(getServiceName()); } - LOGI_IF(mDebugRegion, "showupdates enabled"); - LOGI_IF(mDebugBackground, "showbackground enabled"); - LOGI_IF(mDebugDDMS, "DDMS debugging enabled"); + ALOGI_IF(mDebugRegion, "showupdates enabled"); + ALOGI_IF(mDebugBackground, "showbackground enabled"); + ALOGI_IF(mDebugDDMS, "DDMS debugging enabled"); } SurfaceFlinger::~SurfaceFlinger() @@ -172,7 +172,7 @@ void SurfaceFlinger::bootFinished() { const nsecs_t now = systemTime(); const nsecs_t duration = now - mBootTime; - LOGI("Boot is finished (%ld ms)", long(ns2ms(duration)) ); + ALOGI("Boot is finished (%ld ms)", long(ns2ms(duration)) ); mBootFinished = true; // wait patiently for the window manager death @@ -211,7 +211,7 @@ static inline uint16_t pack565(int r, int g, int b) { status_t SurfaceFlinger::readyToRun() { - LOGI( "SurfaceFlinger's main thread ready to run. " + ALOGI( "SurfaceFlinger's main thread ready to run. " "Initializing graphics H/W..."); // we only support one display currently diff --git a/tools/aapt/ZipEntry.cpp b/tools/aapt/ZipEntry.cpp index b00135e..1f3c93c 100644 --- a/tools/aapt/ZipEntry.cpp +++ b/tools/aapt/ZipEntry.cpp @@ -200,7 +200,7 @@ status_t ZipEntry::addPadding(int padding) if (padding <= 0) return INVALID_OPERATION; - //LOGI("HEY: adding %d pad bytes to existing %d in %s\n", + //ALOGI("HEY: adding %d pad bytes to existing %d in %s\n", // padding, mLFH.mExtraFieldLength, mCDE.mFileName); if (mLFH.mExtraFieldLength > 0) { diff --git a/voip/jni/rtp/EchoSuppressor.cpp b/voip/jni/rtp/EchoSuppressor.cpp index 6127d3c..e223136 100644 --- a/voip/jni/rtp/EchoSuppressor.cpp +++ b/voip/jni/rtp/EchoSuppressor.cpp @@ -177,7 +177,7 @@ void EchoSuppressor::run(int16_t *playbacked, int16_t *recorded) } } } - //LOGI("corr^2 %.5f, var %8.0f %8.0f, latency %d", corr2, varX, varY, + //ALOGI("corr^2 %.5f, var %8.0f %8.0f, latency %d", corr2, varX, varY, // latency * mScale); // Do echo suppression. |