[FIX] cherry-pick 015e0b7ac382c13d4136dcb248dd7b7aabbf868c + merge

fix custom chart bug

Change-Id: Id662a17cd4f864189cd39e29a8b894689880d665

Conflicts:
	custom_chart/da_chart.c

diff --git a/custom_chart/da_chart.c b/custom_chart/da_chart.c
index ad8140f..44af72a 100755 (executable)
--- a/custom_chart/da_chart.c
+++ b/custom_chart/da_chart.c
@@ -560,8 +560,10 @@ int da_set_callback(da_handle series_handle, da_user_data_2_chart_data callback,
        // register new callback
        if(callback != NULL)
        {
+               int re;
                add_to_callback_list(interval, cindex, series_handle, callback, data_addr);
-               start_callback_thread(interval);
+               re = start_callback_thread(interval);
+               LOG("start callback thread return %d\n", re);
        }
        probeBlockEnd();
 

diff --git a/include/dahelper.h b/include/dahelper.h
index ad08d7e..e764aee 100755 (executable)
--- a/include/dahelper.h
+++ b/include/dahelper.h
@@ -84,7 +84,8 @@ extern "C"{
        do {                                                                                                            \
                LOG("screenshot_unlock : %d, %s\n", gTraceInfo.screenshot.state, __func__); \
                pthread_mutex_lock(&(gTraceInfo.screenshot.ssMutex));   \
-               gTraceInfo.screenshot.state = 1;                                                \
+               if(gTraceInfo.screenshot.state < 0)                                             \
+                       gTraceInfo.screenshot.state = 1;                                        \
                pthread_mutex_unlock(&(gTraceInfo.screenshot.ssMutex)); \
        } while(0)
 
@@ -226,7 +227,6 @@ void _cb_render_post(void* data, Evas* e, void* eventinfo);
 int initialize_event();
 int finalize_event();
 int getOrientation();
-void orientationEnabled();
 void on_orientation_changed(int angle, bool capi);
 
 int remove_indir(const char* dirname);

diff --git a/probe_event/da_event.c b/probe_event/da_event.c
index c283a6b..1538bd2 100755 (executable)
--- a/probe_event/da_event.c
+++ b/probe_event/da_event.c
@@ -45,7 +45,6 @@
 
 static int external_angle = 0;
 static int internal_angle = 0;
-static bool orientation_enabled = false;
 
 // ===================================================================
 // orientation related functions
@@ -104,13 +103,10 @@ void on_orientation_changed(int angle, bool capi)
                        FLUSH_LOCAL_BUF();
                }
 
-//             if(orientation_enabled)
+               SCREENSHOT_SET();
+//             if(!capi)
 //             {
-                       SCREENSHOT_SET();
-//                     if(!capi)
-//                     {
-//                             SCREENSHOT_DONE();
-//                     }
+//                     SCREENSHOT_DONE();
 //             }
        }
        else { }        // do nothing
@@ -118,11 +114,6 @@ void on_orientation_changed(int angle, bool capi)
        probeBlockEnd();
 }
 
-void orientationEnabled()
-{
-       orientation_enabled = true;
-}
-
 int getOrientation()
 {
        return external_angle;