commit c7789d2fdc9f901e6772555ec71604a4e8e4790b
author Muhua Li <muhual@codeaurora.org> Tue Mar 26 16:54:37 2013 -0700
committer Iliyan Malchev <malchev@google.com> Fri Apr 19 11:07:37 2013 -0700
tree 446e840e6fc5cac59b395afcf146afdde20cbe07
parent d65457fff7e4974c153e666decc54ac28ccad829

QCamera2: change error callback method

Change from DataCB to NotifyCB for populating error during
picture taking. Previously HAL is passing NULL data ptr to
dataCB in case of error, but Camera service layer is checking
data ptr not NULL in dataCB and therefore leading to crash.

Change-Id: I1e99e773a2199ae621e97b4fb6d96a64cbcd7e3c

camera/QCamera2/HAL/QCameraPostProc.cpp

diff --git a/camera/QCamera2/HAL/QCameraPostProc.cpp b/camera/QCamera2/HAL/QCameraPostProc.cpp
index 88c2722..0817bea 100644
--- a/camera/QCamera2/HAL/QCameraPostProc.cpp
+++ b/camera/QCamera2/HAL/QCameraPostProc.cpp
@@ -586,11 +586,9 @@
 end:
     if (rc != NO_ERROR) {
         // send error msg to upper layer
-        sendDataNotify(CAMERA_MSG_COMPRESSED_IMAGE,
-                       NULL,
-                       0,
-                       NULL,
-                       NULL);
+        sendEvtNotify(CAMERA_MSG_ERROR,
+                      UNKNOWN_ERROR,
+                      0);
 
         if (NULL != jpeg_mem) {
             jpeg_mem->release(jpeg_mem);
@@ -1289,11 +1287,7 @@
 
                                 pme->releaseJpegJobData(jpeg_job);
                                 free(jpeg_job);
-                                pme->sendDataNotify(CAMERA_MSG_COMPRESSED_IMAGE,
-                                                    NULL,
-                                                    0,
-                                                    NULL,
-                                                    NULL);
+                                pme->sendEvtNotify(CAMERA_MSG_ERROR, UNKNOWN_ERROR, 0);
                             }
                         }
                     }
@@ -1309,11 +1303,7 @@
                         if (NO_ERROR != ret) {
                             pme->releaseSuperBuf(super_buf);
                             free(super_buf);
-                            pme->sendDataNotify(CAMERA_MSG_COMPRESSED_IMAGE,
-                                                NULL,
-                                                0,
-                                                NULL,
-                                                NULL);
+                            pme->sendEvtNotify(CAMERA_MSG_ERROR, UNKNOWN_ERROR, 0);
                         }
                     }
 
@@ -1353,11 +1343,7 @@
                                 free(pp_frame);
                             }
                             // send error notify
-                            pme->sendDataNotify(CAMERA_MSG_COMPRESSED_IMAGE,
-                                                NULL,
-                                                0,
-                                                NULL,
-                                                NULL);
+                            pme->sendEvtNotify(CAMERA_MSG_ERROR, UNKNOWN_ERROR, 0);
                         }
                     }
                 } else {