commit c1a4ab9c313d8a3d12007f2dbef7b5a6fa4ac2ef
author Steve Block <steveblock@google.com> Fri Jan 06 19:16:58 2012 +0000
committer Steve Block <steveblock@google.com> Sun Jan 08 11:26:30 2012 +0000
tree 76e90a6ae1910835a56e4dad3f60f42392645703
parent e8e1ddccd616e8226b7cc1e4e9fdb327429249e8

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)  DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/157220

Also fix an occurrence of LOGW missed in an earlier change.

Bug: 5449033
Change-Id: I2e3b23839e6dcd09015d6402280e9300c75e3406

vm/IndirectRefTable.cpp

diff --git a/vm/IndirectRefTable.cpp b/vm/IndirectRefTable.cpp
index 01a5684..69afccd 100644
--- a/vm/IndirectRefTable.cpp
+++ b/vm/IndirectRefTable.cpp
@@ -93,7 +93,7 @@
         if (topIndex == alloc_entries_) {
             /* reached end of allocated space; did we hit buffer max? */
             if (topIndex == max_entries_) {
-                LOGE("JNI ERROR (app bug): %s reference table overflow (max=%d)",
+                ALOGE("JNI ERROR (app bug): %s reference table overflow (max=%d)",
                         indirectRefKindToString(kind_), max_entries_);
                 return NULL;
             }
@@ -107,7 +107,7 @@
             IndirectRefSlot* newTable =
                     (IndirectRefSlot*) realloc(table_, newSize * sizeof(IndirectRefSlot));
             if (table_ == NULL) {
-                LOGE("JNI ERROR (app bug): unable to expand %s reference table "
+                ALOGE("JNI ERROR (app bug): unable to expand %s reference table "
                         "(from %d to %d, max=%d)",
                         indirectRefKindToString(kind_),
                         alloc_entries_, newSize, max_entries_);
@@ -145,7 +145,7 @@
             return kInvalidIndirectRefObject;
         }
         if (kind == kIndirectKindInvalid) {
-            LOGE("JNI ERROR (app bug): invalid %s reference %p",
+            ALOGE("JNI ERROR (app bug): invalid %s reference %p",
                     indirectRefKindToString(kind_), iref);
             abortMaybe();
             return kInvalidIndirectRefObject;
@@ -158,7 +158,7 @@
     u4 index = extractIndex(iref);
     if (index >= topIndex) {
         /* bad -- stale reference? */
-        LOGE("JNI ERROR (app bug): accessed stale %s reference %p (index %d in a table of size %d)",
+        ALOGE("JNI ERROR (app bug): accessed stale %s reference %p (index %d in a table of size %d)",
                 indirectRefKindToString(kind_), iref, index, topIndex);
         abortMaybe();
         return kInvalidIndirectRefObject;
@@ -174,7 +174,7 @@
 
     u4 serial = extractSerial(iref);
     if (serial != table_[index].serial) {
-        LOGE("JNI ERROR (app bug): attempt to use stale %s reference %p",
+        ALOGE("JNI ERROR (app bug): attempt to use stale %s reference %p",
                 indirectRefKindToString(kind_), iref);
         abortMaybe();
         return kInvalidIndirectRefObject;