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

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

Bug: 5449033
Change-Id: Iad3389731482399f1148ae9a19248e3eea55d9fd

10 files changed, 41 insertions, 41 deletions

diff --git a/omx/audio/src/openmax_il/aac_dec/inc/OMX_AacDec_Utils.h b/omx/audio/src/openmax_il/aac_dec/inc/OMX_AacDec_Utils.h
index 6b51fd7..c516816 100644
--- a/omx/audio/src/openmax_il/aac_dec/inc/OMX_AacDec_Utils.h
+++ b/omx/audio/src/openmax_il/aac_dec/inc/OMX_AacDec_Utils.h
@@ -264,7 +264,7 @@
     #define AACDEC_MEMPRINT(...)
 #endif
 
-#define AACDEC_EPRINT LOGE
+#define AACDEC_EPRINT ALOGE
 
 #endif
 
diff --git a/omx/audio/src/openmax_il/mp3_dec/inc/OMX_Mp3Dec_Utils.h b/omx/audio/src/openmax_il/mp3_dec/inc/OMX_Mp3Dec_Utils.h
index 4b74b90..08dd7a3 100644
--- a/omx/audio/src/openmax_il/mp3_dec/inc/OMX_Mp3Dec_Utils.h
+++ b/omx/audio/src/openmax_il/mp3_dec/inc/OMX_Mp3Dec_Utils.h
@@ -226,7 +226,7 @@
 #endif
 
 #ifdef ANDROID
-  #define MP3DEC_EPRINT LOGE
+  #define MP3DEC_EPRINT ALOGE
 #else
   #define MP3DEC_EPRINT printf
 #endif
diff --git a/omx/audio/src/openmax_il/nbamr_enc/inc/OMX_AmrEnc_Utils.h b/omx/audio/src/openmax_il/nbamr_enc/inc/OMX_AmrEnc_Utils.h
index 13a872a..18b0f78 100644
--- a/omx/audio/src/openmax_il/nbamr_enc/inc/OMX_AmrEnc_Utils.h
+++ b/omx/audio/src/openmax_il/nbamr_enc/inc/OMX_AmrEnc_Utils.h
@@ -123,7 +123,7 @@
 /* ======================================================================= */
 #ifndef UNDER_CE
     #ifdef ANDROID
-        #define AMRENC_EPRINT LOGE
+        #define AMRENC_EPRINT ALOGE
     #else   
         #define AMRENC_EPRINT(...)    fprintf(stderr,__VA_ARGS__)
     #endif
diff --git a/omx/audio/src/openmax_il/wma_dec/inc/OMX_WmaDec_Utils.h b/omx/audio/src/openmax_il/wma_dec/inc/OMX_WmaDec_Utils.h
index c6cda39..47ec1df 100644
--- a/omx/audio/src/openmax_il/wma_dec/inc/OMX_WmaDec_Utils.h
+++ b/omx/audio/src/openmax_il/wma_dec/inc/OMX_WmaDec_Utils.h
@@ -375,7 +375,7 @@ typedef struct OMXBufferStatus /*BUFFERSTATUS*/
  */
 /* ======================================================================= */
 #ifndef UNDER_CE
-#define WMADEC_EPRINT LOGE
+#define WMADEC_EPRINT ALOGE
 #else
 #define WMADEC_EPRINT		  printf
 #endif
diff --git a/omx/core_plugin/omx_core_plugin/src/ti_omx_interface.cpp b/omx/core_plugin/omx_core_plugin/src/ti_omx_interface.cpp
index 57e4eca..18a7e07 100644
--- a/omx/core_plugin/omx_core_plugin/src/ti_omx_interface.cpp
+++ b/omx/core_plugin/omx_core_plugin/src/ti_omx_interface.cpp
@@ -23,11 +23,11 @@ class TIOMXInterface : public OMXInterface
                 const char* pErr = dlerror();
                 if (NULL != pErr)
                 {
-                    LOGE("TIOMXInterface: Error closing library: %s\n", pErr);
+                    ALOGE("TIOMXInterface: Error closing library: %s\n", pErr);
                 }
                 else
                 {
-                    LOGE("OsclSharedLibrary::Close: Error closing library, no error reported");
+                    ALOGE("OsclSharedLibrary::Close: Error closing library, no error reported");
                 }
             }
 
@@ -45,7 +45,7 @@ class TIOMXInterface : public OMXInterface
                 return this;
             }
             // the ID doesn't match
-            LOGE("TIOMXInterface: library lookup failed\n");
+            ALOGE("TIOMXInterface: library lookup failed\n");
             return NULL;
         };
 
@@ -89,13 +89,13 @@ class TIOMXInterface : public OMXInterface
                 if (NULL == pErr)
                 {
                     // No error reported, but no handle to the library
-                    LOGE("OsclLib::LoadLibrary: Error opening "
+                    ALOGE("OsclLib::LoadLibrary: Error opening "
                          "library (%s) but no error reported\n", OMX_CORE_LIBRARY);
                 }
                 else
                 {
                     // Error reported
-                    LOGE("OsclLib::LoadLibrary: Error opening "
+                    ALOGE("OsclLib::LoadLibrary: Error opening "
                          "library (%s): %s\n", OMX_CORE_LIBRARY, pErr);
                 }
             }
diff --git a/omx/image/src/openmax_il/jpeg_enc/src/OMX_JpegEnc_Utils.c b/omx/image/src/openmax_il/jpeg_enc/src/OMX_JpegEnc_Utils.c
index 57c7b92..5bfd7dd 100644
--- a/omx/image/src/openmax_il/jpeg_enc/src/OMX_JpegEnc_Utils.c
+++ b/omx/image/src/openmax_il/jpeg_enc/src/OMX_JpegEnc_Utils.c
@@ -3254,7 +3254,7 @@ void LinkedList_AddElement(LinkedList *LinkedList, void *pValue) {
         pthread_mutex_unlock(&LinkedList->lock);
     }
     else {
-         LOGE("Linked list memory allocation failed.\n" );
+         ALOGE("Linked list memory allocation failed.\n" );
     }
 }
 
diff --git a/omx/system/src/openmax_il/lcml/src/LCML_DspCodec.c b/omx/system/src/openmax_il/lcml/src/LCML_DspCodec.c
index c74082a..09c2969 100644
--- a/omx/system/src/openmax_il/lcml/src/LCML_DspCodec.c
+++ b/omx/system/src/openmax_il/lcml/src/LCML_DspCodec.c
@@ -1856,7 +1856,7 @@ void* MessagingThread(void* arg)
                             status = DSPProcessor_InvalidateMemory(hDSPInterface->dspCodec->hProc,
                                             tmpDspStructAddress, sizeof(TArmDspCommunicationStruct));
                             if (DSP_FAILED(status)) {
-                                LOGE("Invalidate for communication structure failed. status = 0x%x\n", status);
+                                ALOGE("Invalidate for communication structure failed. status = 0x%x\n", status);
                             }
 
                             // Only invalidate the memory when the pointer points to some valid memory region
@@ -1865,7 +1865,7 @@ void* MessagingThread(void* arg)
                                 status = DSPProcessor_InvalidateMemory(hDSPInterface->dspCodec->hProc,
                                                 tmpDspStructAddress->iArmParamArg, tmpDspStructAddress->iParamSize);
                                 if (DSP_FAILED(status)) {
-                                    LOGE("Invalidate for arm parameter arguments failed. status = 0x%x\n", status);
+                                    ALOGE("Invalidate for arm parameter arguments failed. status = 0x%x\n", status);
                                 }
                             }
 
diff --git a/omx/system/src/openmax_il/omx_core/src/OMX_Core.c b/omx/system/src/openmax_il/omx_core/src/OMX_Core.c
index abfe9b9..bf65172 100755
--- a/omx/system/src/openmax_il/omx_core/src/OMX_Core.c
+++ b/omx/system/src/openmax_il/omx_core/src/OMX_Core.c
@@ -121,7 +121,7 @@ OMX_ERRORTYPE TIOMX_Init()
 
     if(pthread_mutex_lock(&mutex) != 0)
     {
-        LOGE("%d :: Core: Error in Mutex lock\n",__LINE__);
+        ALOGE("%d :: Core: Error in Mutex lock\n",__LINE__);
         return OMX_ErrorUndefined;
     }
 
@@ -135,7 +135,7 @@ OMX_ERRORTYPE TIOMX_Init()
 
     if(pthread_mutex_unlock(&mutex) != 0)
     {
-        LOGE("%d :: Core: Error in Mutex unlock\n",__LINE__);
+        ALOGE("%d :: Core: Error in Mutex unlock\n",__LINE__);
         return OMX_ErrorUndefined;
     }
     return eError;
@@ -176,7 +176,7 @@ OMX_ERRORTYPE TIOMX_GetHandle( OMX_HANDLETYPE* pHandle, OMX_STRING cComponentNam
 
     if(pthread_mutex_lock(&mutex) != 0)
     {
-        LOGE("%d :: Core: Error in Mutex lock\n",__LINE__);
+        ALOGE("%d :: Core: Error in Mutex lock\n",__LINE__);
         return OMX_ErrorUndefined;
     }
 
@@ -214,7 +214,7 @@ OMX_ERRORTYPE TIOMX_GetHandle( OMX_HANDLETYPE* pHandle, OMX_STRING cComponentNam
             /* check if the component is already loaded */
             if (componentTable[refIndex].refCount >= MAX_CONCURRENT_INSTANCES) {
                 err = OMX_ErrorInsufficientResources;
-                LOGE("Max instances of component %s already created.\n", cComponentName);
+                ALOGE("Max instances of component %s already created.\n", cComponentName);
                 goto UNLOCK_MUTEX;
             } else {  // we have not reached the limit yet
                 /* do what was done before need to limit concurrent instances of each component */
@@ -240,7 +240,7 @@ OMX_ERRORTYPE TIOMX_GetHandle( OMX_HANDLETYPE* pHandle, OMX_STRING cComponentNam
 
                 pModules[i] = dlopen(buf, RTLD_LAZY | RTLD_GLOBAL);
                 if( pModules[i] == NULL ) {
-                    LOGE("dlopen %s failed because %s\n", buf, dlerror());
+                    ALOGE("dlopen %s failed because %s\n", buf, dlerror());
                     err = OMX_ErrorComponentNotFound;
                     goto UNLOCK_MUTEX;
                 }
@@ -250,7 +250,7 @@ OMX_ERRORTYPE TIOMX_GetHandle( OMX_HANDLETYPE* pHandle, OMX_STRING cComponentNam
                 pComponentInit = dlsym(pModules[i], "OMX_ComponentInit");
                 pErr = dlerror();
                 if( (pErr != NULL) || (pComponentInit == NULL) ) {
-                    LOGE("%d:: dlsym failed for module %p\n", __LINE__, pModules[i]);
+                    ALOGE("%d:: dlsym failed for module %p\n", __LINE__, pModules[i]);
                     err = OMX_ErrorInvalidComponent;
                     goto CLEAN_UP;
                 }
@@ -261,7 +261,7 @@ OMX_ERRORTYPE TIOMX_GetHandle( OMX_HANDLETYPE* pHandle, OMX_STRING cComponentNam
                 *pHandle = malloc(sizeof(OMX_COMPONENTTYPE));
                 if(*pHandle == NULL) {
                     err = OMX_ErrorInsufficientResources;
-                    LOGE("%d:: malloc of pHandle* failed\n", __LINE__);
+                    ALOGE("%d:: malloc of pHandle* failed\n", __LINE__);
                     goto CLEAN_UP;
                 }
 
@@ -272,7 +272,7 @@ OMX_ERRORTYPE TIOMX_GetHandle( OMX_HANDLETYPE* pHandle, OMX_STRING cComponentNam
                 if (OMX_ErrorNone == err) {
                     err = (componentType->SetCallbacks)(*pHandle, pCallBacks, pAppData);
                     if (err != OMX_ErrorNone) {
-                        LOGE("%d :: Core: SetCallBack failed %d\n",__LINE__, err);
+                        ALOGE("%d :: Core: SetCallBack failed %d\n",__LINE__, err);
                         goto CLEAN_UP;
                     }
                     /* finally, OMX_ComponentInit() was successful and
@@ -283,7 +283,7 @@ OMX_ERRORTYPE TIOMX_GetHandle( OMX_HANDLETYPE* pHandle, OMX_STRING cComponentNam
                     goto UNLOCK_MUTEX;  // Component is found, and thus we are done
                 }
                 else if (err == OMX_ErrorInsufficientResources) {
-                        LOGE("%d :: Core: Insufficient Resources for Component %d\n",__LINE__, err);
+                        ALOGE("%d :: Core: Insufficient Resources for Component %d\n",__LINE__, err);
                         goto CLEAN_UP;
                 }
             }
@@ -307,7 +307,7 @@ CLEAN_UP:
 UNLOCK_MUTEX:
     if(pthread_mutex_unlock(&mutex) != 0)
     {
-        LOGE("%d :: Core: Error in Mutex unlock\n",__LINE__);
+        ALOGE("%d :: Core: Error in Mutex unlock\n",__LINE__);
         err = OMX_ErrorUndefined;
     }
     return (err);
@@ -337,7 +337,7 @@ OMX_ERRORTYPE TIOMX_FreeHandle (OMX_HANDLETYPE hComponent)
 
     if(pthread_mutex_lock(&mutex) != 0)
     {
-        LOGE("%d :: Core: Error in Mutex lock\n",__LINE__);
+        ALOGE("%d :: Core: Error in Mutex lock\n",__LINE__);
         return OMX_ErrorUndefined;
     }
 
@@ -348,14 +348,14 @@ OMX_ERRORTYPE TIOMX_FreeHandle (OMX_HANDLETYPE hComponent)
     }
 
     if(i == COUNTOF(pModules)) {
-        LOGE("%d :: Core: component %p is not found\n", __LINE__, hComponent);
+        ALOGE("%d :: Core: component %p is not found\n", __LINE__, hComponent);
         retVal = OMX_ErrorBadParameter;
         goto EXIT;
     }
 
     retVal = pHandle->ComponentDeInit(hComponent);
     if (retVal != OMX_ErrorNone) {
-        LOGE("%d :: ComponentDeInit failed %d\n",__LINE__, retVal);
+        ALOGE("%d :: ComponentDeInit failed %d\n",__LINE__, retVal);
         goto EXIT;
     }
 
@@ -387,7 +387,7 @@ EXIT:
     /* The unload is now complete, so set the error code to pass and exit */
     if(pthread_mutex_unlock(&mutex) != 0)
     {
-        LOGE("%d :: Core: Error in Mutex unlock\n",__LINE__);
+        ALOGE("%d :: Core: Error in Mutex unlock\n",__LINE__);
         return OMX_ErrorUndefined;
     }
 
@@ -409,7 +409,7 @@ EXIT:
 OMX_ERRORTYPE TIOMX_Deinit()
 {
     if(pthread_mutex_lock(&mutex) != 0) {
-        LOGE("%d :: Core: Error in Mutex lock\n",__LINE__);
+        ALOGE("%d :: Core: Error in Mutex lock\n",__LINE__);
         return OMX_ErrorUndefined;
     }
 
@@ -420,7 +420,7 @@ OMX_ERRORTYPE TIOMX_Deinit()
     ALOGD("deinit count = %d\n", count);
 
     if(pthread_mutex_unlock(&mutex) != 0) {
-        LOGE("%d :: Core: Error in Mutex unlock\n",__LINE__);
+        ALOGE("%d :: Core: Error in Mutex unlock\n",__LINE__);
         return OMX_ErrorUndefined;
     }
 
@@ -548,11 +548,11 @@ OMX_API OMX_ERRORTYPE TIOMX_GetRolesOfComponent (
     {
         if (cComponentName == NULL)
         {
-            LOGE("cComponentName is NULL\n");
+            ALOGE("cComponentName is NULL\n");
         }
         if (pNumRoles == NULL)
         {
-            LOGE("pNumRoles is NULL\n");
+            ALOGE("pNumRoles is NULL\n");
         }
         eError = OMX_ErrorBadParameter;
         goto EXIT;       
@@ -569,7 +569,7 @@ OMX_API OMX_ERRORTYPE TIOMX_GetRolesOfComponent (
     if (!bFound)
     {
         eError = OMX_ErrorComponentNotFound;
-        LOGE("component %s not found\n", cComponentName);
+        ALOGE("component %s not found\n", cComponentName);
         goto EXIT;
     } 
     if (roles == NULL)
@@ -593,7 +593,7 @@ OMX_API OMX_ERRORTYPE TIOMX_GetRolesOfComponent (
         else
         {
             eError = OMX_ErrorBadParameter;
-            LOGE("pNumRoles (%d) is less than actual number (%d) of roles \
+            ALOGE("pNumRoles (%d) is less than actual number (%d) of roles \
                    for this component %s\n", *pNumRoles, componentTable[i].nRoles, cComponentName);
         }
     }
@@ -631,11 +631,11 @@ OMX_API OMX_ERRORTYPE TIOMX_GetComponentsOfRole (
     {
        if (role == NULL)
        {
-           LOGE("role is NULL");
+           ALOGE("role is NULL");
        }
        if (pNumComps == NULL)
        {
-           LOGE("pNumComps is NULL\n");
+           ALOGE("pNumComps is NULL\n");
        }
        eError = OMX_ErrorBadParameter;
        goto EXIT;
@@ -645,7 +645,7 @@ OMX_API OMX_ERRORTYPE TIOMX_GetComponentsOfRole (
     if (!tableCount)
     {
         eError = OMX_ErrorUndefined;
-        LOGE("Component table is empty. Please reload OMX Core\n");
+        ALOGE("Component table is empty. Please reload OMX Core\n");
         goto EXIT;
     }
 
@@ -667,7 +667,7 @@ OMX_API OMX_ERRORTYPE TIOMX_GetComponentsOfRole (
     if (compOfRoleCount == 0)
     {
         eError = OMX_ErrorComponentNotFound;
-        LOGE("Component supporting role %s was not found\n", role);
+        ALOGE("Component supporting role %s was not found\n", role);
     }
     if (compNames == NULL)
     {
@@ -684,7 +684,7 @@ OMX_API OMX_ERRORTYPE TIOMX_GetComponentsOfRole (
                the array is not large enough
             */
             eError = OMX_ErrorBadParameter;
-            LOGE("pNumComps (%d) is less than the actual number (%d) of components \
+            ALOGE("pNumComps (%d) is less than the actual number (%d) of components \
                   supporting role %s\n", *pNumComps, compOfRoleCount, role);
         }
         else
@@ -758,7 +758,7 @@ OMX_ERRORTYPE TIOMX_BuildComponentTable()
     }
     tableCount = numFiles;
     if (eError != OMX_ErrorNone){
-        LOGE("Could not build Component Table\n");
+        ALOGE("Could not build Component Table\n");
     }
 
     return eError;
diff --git a/omx/video/src/openmax_il/video_decode/src/OMX_VideoDec_Utils.c b/omx/video/src/openmax_il/video_decode/src/OMX_VideoDec_Utils.c
index 07ae412..1e12cec 100644
--- a/omx/video/src/openmax_il/video_decode/src/OMX_VideoDec_Utils.c
+++ b/omx/video/src/openmax_il/video_decode/src/OMX_VideoDec_Utils.c
@@ -8447,7 +8447,7 @@ OMX_ERRORTYPE VIDDEC_CopyBuffer(VIDDEC_COMPONENT_PRIVATE* pComponentPrivate,
             free(pComponentPrivate->eFirstBuffer.pFirstBufferSaved);
             pComponentPrivate->eFirstBuffer.pFirstBufferSaved = NULL;
         } else {
-            LOGE("Not enough memory in the buffer to concatenate the 2 frames, loosing first frame\n");
+            ALOGE("Not enough memory in the buffer to concatenate the 2 frames, loosing first frame\n");
         }
 EXIT:
     OMX_PRINT1(pComponentPrivate->dbg, "OUT\n");
diff --git a/omx/video/src/openmax_il/video_decode/src/OMX_VideoDecoder.c b/omx/video/src/openmax_il/video_decode/src/OMX_VideoDecoder.c
index 357bffb..5af4fcb 100644
--- a/omx/video/src/openmax_il/video_decode/src/OMX_VideoDecoder.c
+++ b/omx/video/src/openmax_il/video_decode/src/OMX_VideoDecoder.c
@@ -2384,7 +2384,7 @@ static OMX_ERRORTYPE VIDDEC_EmptyThisBuffer (OMX_HANDLETYPE pComponent,
     bIsInputFlushPending = pComponentPrivate->bIsInputFlushPending;
     VIDDEC_PTHREAD_MUTEX_UNLOCK(pComponentPrivate->inputFlushCompletionMutex);
     if (bIsInputFlushPending) {
-        LOGE("Unable to process any OMX_EmptyThisBuffer requsts with input flush pending");
+        ALOGE("Unable to process any OMX_EmptyThisBuffer requsts with input flush pending");
         return OMX_ErrorIncorrectStateOperation;
     }
 #ifdef __PERF_INSTRUMENTATION__
@@ -2478,7 +2478,7 @@ static OMX_ERRORTYPE VIDDEC_FillThisBuffer (OMX_HANDLETYPE pComponent,
     bIsOutputFlushPending = pComponentPrivate->bIsOutputFlushPending;
     VIDDEC_PTHREAD_MUTEX_UNLOCK(pComponentPrivate->outputFlushCompletionMutex);
     if (bIsOutputFlushPending) {
-        LOGE("Unable to process any OMX_FillThisBuffer requsts with flush pending");
+        ALOGE("Unable to process any OMX_FillThisBuffer requsts with flush pending");
         return OMX_ErrorIncorrectStateOperation;
     }