am 8d18af6d: am e4639448: CameraHAL: clean up logs

* commit '8d18af6dfd68f047c2bcf82fe88eeeb623eafa0c':
  CameraHAL: clean up logs

6 files changed, 16 insertions, 14 deletions

diff --git a/camera/AppCallbackNotifier.cpp b/camera/AppCallbackNotifier.cpp
index ea0d2a8..2914307 100644
--- a/camera/AppCallbackNotifier.cpp
+++ b/camera/AppCallbackNotifier.cpp
@@ -1194,7 +1194,7 @@ bool AppCallbackNotifier::processMessage()
       {
         case NotificationThread::NOTIFIER_EXIT:
           {
-            CAMHAL_LOGEA("Received NOTIFIER_EXIT command from Camera HAL");
+            CAMHAL_LOGI("Received NOTIFIER_EXIT command from Camera HAL");
             mNotifierState = AppCallbackNotifier::NOTIFIER_EXITED;
             ret = false;
             break;
diff --git a/camera/BaseCameraAdapter.cpp b/camera/BaseCameraAdapter.cpp
index d95fdc3..882e4df 100644
--- a/camera/BaseCameraAdapter.cpp
+++ b/camera/BaseCameraAdapter.cpp
@@ -299,7 +299,7 @@ void BaseCameraAdapter::returnFrame(void* frameBuf, CameraFrame::FrameType frame
             }
         else
             {
-            CAMHAL_LOGEA("Frame returned when ref count is already zero!!");
+            CAMHAL_LOGDA("Frame returned when ref count is already zero!!");
             return;
             }
         }
@@ -1220,7 +1220,7 @@ status_t BaseCameraAdapter::__sendFrameToSubscribers(CameraFrame* frame,
           frame->mYuv[1] = lframe->mYuv[1];
         }
         else{
-          CAMHAL_LOGEA("Empty Frame Queue");
+          CAMHAL_LOGDA("Empty Frame Queue");
           return -EINVAL;
         }
       }
diff --git a/camera/CameraHal.cpp b/camera/CameraHal.cpp
index c192007..c7ba87f 100644
--- a/camera/CameraHal.cpp
+++ b/camera/CameraHal.cpp
@@ -693,7 +693,7 @@ int CameraHal::setParameters(const CameraParameters& params)
 
         if( (valstr = params.get(CameraParameters::KEY_FOCUS_AREAS)) != NULL )
             {
-            CAMHAL_LOGEB("Focus areas position set %s", params.get(CameraParameters::KEY_FOCUS_AREAS));
+            CAMHAL_LOGI("Focus areas position set %s", params.get(CameraParameters::KEY_FOCUS_AREAS));
             mParameters.set(CameraParameters::KEY_FOCUS_AREAS, valstr);
             }
 
@@ -910,7 +910,7 @@ int CameraHal::setParameters(const CameraParameters& params)
           }
         if( (valstr = params.get(CameraParameters::KEY_METERING_AREAS)) != NULL )
             {
-            CAMHAL_LOGEB("Metering areas position set %s", params.get(CameraParameters::KEY_METERING_AREAS));
+            CAMHAL_LOGI("Metering areas position set %s", params.get(CameraParameters::KEY_METERING_AREAS));
             mParameters.set(CameraParameters::KEY_METERING_AREAS, valstr);
             }
 
@@ -1431,7 +1431,7 @@ status_t CameraHal::startPreview()
 
     ///If we don't have the preview callback enabled and display adapter,
     if(!mSetPreviewWindowCalled || (mDisplayAdapter.get() == NULL)){
-      CAMHAL_LOGEA("Preview not started. Preview in progress flag set");
+      CAMHAL_LOGI("Preview not started. Preview in progress flag set");
       mPreviewStartInProgress = true;
       ret = mCameraAdapter->sendCommand(CameraAdapter::CAMERA_SWITCH_TO_EXECUTING);
       if ( NO_ERROR != ret ){
@@ -1660,13 +1660,13 @@ status_t CameraHal::setPreviewWindow(struct preview_stream_ops *window)
         if(mDisplayAdapter.get() != NULL)
         {
             ///NULL window passed, destroy the display adapter if present
-            CAMHAL_LOGEA("NULL window passed, destroying display adapter");
+            CAMHAL_LOGI("NULL window passed, destroying display adapter");
             mDisplayAdapter.clear();
             ///@remarks If there was a window previously existing, we usually expect another valid window to be passed by the client
             ///@remarks so, we will wait until it passes a valid window to begin the preview again
             mSetPreviewWindowCalled = false;
         }
-        CAMHAL_LOGEA("NULL ANativeWindow passed to setPreviewWindow");
+        CAMHAL_LOGI("NULL ANativeWindow passed to setPreviewWindow");
         return NO_ERROR;
     }else if(mDisplayAdapter.get() == NULL)
     {
@@ -2179,7 +2179,7 @@ status_t CameraHal::autoFocus()
 
     if (state == CameraAdapter::AF_STATE)
         {
-            CAMHAL_LOGDA("Ignoring start-AF (already in progress)");
+            CAMHAL_LOGI("Ignoring start-AF (already in progress)");
             goto EXIT;
         }
 
diff --git a/camera/CameraHal_Module.cpp b/camera/CameraHal_Module.cpp
index 2acb1e0..daff31e 100644
--- a/camera/CameraHal_Module.cpp
+++ b/camera/CameraHal_Module.cpp
@@ -493,7 +493,7 @@ int camera_device_open(const hw_module_t* module, const char* name,
 
     android::Mutex::Autolock lock(gCameraHalDeviceLock);
 
-    LOGI("camera_device open");
+    CAMHAL_LOGI("camera_device open");
 
     if (name != NULL) {
         cameraid = atoi(name);
diff --git a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
index b0e1088..01d37ea 100755
--- a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
+++ b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
@@ -297,7 +297,7 @@ status_t OMXCameraAdapter::initialize(CameraProperties::Properties* caps)
 
     EXIT:
 
-    CAMHAL_LOGEB("Exiting function %s because of ret %d eError=%x", __FUNCTION__, ret, eError);
+    CAMHAL_LOGDB("Exiting function %s because of ret %d eError=%x", __FUNCTION__, ret, eError);
     performCleanupAfterError();
     LOG_FUNCTION_NAME_EXIT;
     return ErrorUtils::omxToAndroidError(eError);
@@ -2736,7 +2736,7 @@ OMX_ERRORTYPE OMXCameraAdapter::SignalEvent(OMX_IN OMX_HANDLETYPE hComponent,
         }
     else
         {
-        CAMHAL_LOGEA("Event queue empty!!!");
+        CAMHAL_LOGDA("Event queue empty!!!");
         }
 
     LOG_FUNCTION_NAME_EXIT;
@@ -3327,7 +3327,7 @@ bool OMXCameraAdapter::CommandHandler::Handler()
             }
             case CommandHandler::COMMAND_EXIT:
             {
-                CAMHAL_LOGEA("Exiting command handler");
+                CAMHAL_LOGDA("Exiting command handler");
                 forever = 0;
                 break;
             }
@@ -3369,7 +3369,7 @@ bool OMXCameraAdapter::OMXCallbackHandler::Handler()
             }
             case CommandHandler::COMMAND_EXIT:
             {
-                CAMHAL_LOGEA("Exiting OMX callback handler");
+                CAMHAL_LOGDA("Exiting OMX callback handler");
                 forever = 0;
                 break;
             }
diff --git a/camera/inc/CameraHal.h b/camera/inc/CameraHal.h
index d139c9c..e34f4df 100644
--- a/camera/inc/CameraHal.h
+++ b/camera/inc/CameraHal.h
@@ -77,6 +77,8 @@
 #define LOCK_BUFFER_TRIES 5
 #define HAL_PIXEL_FORMAT_NV12 0x100
 
+#define CAMHAL_LOGI LOGI
+
 //Uncomment to enable more verbose/debug logs
 //#define DEBUG_LOG