Tizen 2.4 Sync

Change-Id: I39134c2e3e8d4f010509b780bf962b75707afa92

diff --git a/lbs-server/src/gps_plugin_module.c b/lbs-server/src/gps_plugin_module.c
index 44c2e4c..d67a603 100644 (file)
--- a/lbs-server/src/gps_plugin_module.c
+++ b/lbs-server/src/gps_plugin_module.c
@@ -50,7 +50,8 @@ int load_plugin_module(char *specific_name, void **plugin_handle)
 
                if (stat(plugin_path, &st) != 0) {
                        strncpy(plugin_path, GPS_PLUGIN_PATH, sizeof(plugin_path));
-                       setting_set_int(VCONFKEY_LOCATION_REPLAY_ENABLED, 1);
+                       /* To support real GPS when additional plugin is added*/
+                       /* setting_set_int(VCONFKEY_LOCATION_REPLAY_ENABLED, 1); */
                }
        }
 

diff --git a/lbs-server/src/lbs_server.c b/lbs-server/src/lbs_server.c
index a2e44d8..b605c00 100644 (file)
--- a/lbs-server/src/lbs_server.c
+++ b/lbs-server/src/lbs_server.c
@@ -610,7 +610,7 @@ static void update_dynamic_interval_table_foreach_cb(gpointer key, gpointer valu
        lbs_server_s *lbs_server = updator_ud->lbs_server;
        int method = updator_ud->method;
 
-       LOG_GPS(DBG_LOW, "foreach dynamic-interval. method:[%d], key:[%s]-interval:[%u], current optimized interval [%u]", method, (char *)key, interval_array[method], lbs_server->optimized_interval_array[method]);
+       LOG_GPS(DBG_LOW, "method:[%d], key:[%s] interval:[%u], current optimized interval [%u]", method, (char *)key, interval_array[method], lbs_server->optimized_interval_array[method]);
        if ((lbs_server->temp_minimum_interval > interval_array[method])) {
                lbs_server->temp_minimum_interval = interval_array[method];
        }
@@ -954,8 +954,9 @@ static void set_options(GVariant *options, const gchar *client, gpointer userdat
 
                        if (!g_strcmp0(key, "INTERVAL_UPDATE")) {
                                interval = g_variant_get_uint32(value);
-                               LOG_GPS(DBG_LOW, "INTERVAL_UPDATE [%u]", interval);
-                               is_update_interval = TRUE;
+                               LOG_GPS(DBG_LOW, "INTERVAL_UPDATE [%u] <-- [%u] ", interval, lbs_server->temp_minimum_interval);
+                               if (interval != lbs_server->temp_minimum_interval)
+                                       is_update_interval = TRUE;
                        }
                }
 

diff --git a/lbs-server/src/nmea_logger.c b/lbs-server/src/nmea_logger.c
index 94f6145..4a05c5e 100644 (file)
--- a/lbs-server/src/nmea_logger.c
+++ b/lbs-server/src/nmea_logger.c
@@ -123,13 +123,13 @@ static int generate_nmea_log_file(char *filepath)
 {
        int idx = 0;
        int fd = 0;
-       char fn[MAX_NMEA_LOG_FILE_PATH];
+       char fn[MAX_NMEA_LOG_FILE_PATH] = {0,};
 
        for (idx = 0; idx < MAX_NMEA_RAW_DATA_LOG_FILE_CNT; idx++) {
                g_snprintf(fn, MAX_NMEA_LOG_FILE_PATH, "%s%03d.txt", NMEA_LOGGING_FILE_PATH, idx);
                if ((fd = access(fn, R_OK)) == -1) {
                        LOG_GPS(DBG_LOW, "Next log file [%s]", fn);
-                       g_strlcpy(filepath, fn, strlen(fn));
+                       g_strlcpy(filepath, fn, strlen(fn) + 1);
                        return 0;
                }
        }

diff --git a/lbs-server/src/server.c b/lbs-server/src/server.c
index b96cfc8..db42efd 100644 (file)
--- a/lbs-server/src/server.c
+++ b/lbs-server/src/server.c
@@ -67,6 +67,7 @@
 #define BRCM4752_PATH  PLATFORM_PATH"/bcm4752"
 #define BRCM47520_PATH PLATFORM_PATH"/bcm47520"
 #define BRCM47511_PATH PLATFORM_PATH"/bcm47511"
+#define BRCM47522_PATH PLATFORM_PATH"/bcm47522"
 #define CSR_PATH               PLATFORM_PATH"/gsd4t"
 #define QCOM8210_PATH  PLATFORM_PATH"/msm8210_gps"
 #define QCOM8x30_PATH  PLATFORM_PATH"/msm8x30_gps"
@@ -160,7 +161,7 @@ static void reload_plugin_module(gps_server_t *server)
                module_name = server->gps_plugin.name;
        }
 
-       LOG_GPS(DBG_LOW, "Loading plugin.name : %s", module_name);
+       LOG_GPS(DBG_LOW, "replay_enabled:%d, Loading plugin.name: %s", server->replay_enabled, module_name);
 
        if (!get_plugin_module()->deinit(&ReasonCode)) {
                LOG_GPS(DBG_ERR, "Fail to GPS plugin deinit");
@@ -220,7 +221,7 @@ static void _gps_server_set_gps_state(int gps_state)
        }
 
        if (ret == TRUE) {
-               LOG_GPS(DBG_LOW, "Succesee to set VCONFKEY_LOCATION_GPS_STATE");
+               LOG_GPS(DBG_LOW, "Succeed to set VCONFKEY_LOCATION_GPS_STATE");
        } else {
                LOG_GPS(DBG_ERR, "Fail to set VCONF_LOCATION_GPS_STATE");
        }
@@ -1098,7 +1099,8 @@ void check_plugin_module(char *module_name)
        if (get_replay_enabled() == TRUE) {
                g_strlcpy(module_name, "replay", strlen("replay") + 1);
                LOG_GPS(DBG_LOW, "REPLAY_ENABELD is TRUE");
-       } else if (access(BRCM4752_PATH, F_OK) == 0 || access(BRCM47520_PATH, F_OK) == 0) {
+       } else if (access(BRCM4752_PATH, F_OK) == 0 || access(BRCM47520_PATH, F_OK) == 0 ||
+                               access(BRCM47522_PATH, F_OK) == 0) {
                g_strlcpy(module_name, "brcm", strlen("brcm") + 1);
        } else if (access(BRCM47511_PATH, F_OK) == 0) {
                g_strlcpy(module_name, "brcm-legacy", strlen("brcm-legacy") + 1);

diff --git a/module/nps_module.c b/module/nps_module.c
index 5f59c62..4f27f6b 100644 (file)
--- a/module/nps_module.c
+++ b/module/nps_module.c
@@ -101,7 +101,6 @@ static void position_callback(GVariant *param, void *user_data)
 
        vel = location_velocity_new(timestamp, speed, direction, climb);
        acc = location_accuracy_new(LOCATION_ACCURACY_LEVEL_DETAILED, horizontal, vertical);
-       MOD_NPS_LOGD("time(%d)", pos->timestamp);
        MOD_NPS_LOGD("method(%d)", method);
 
        mod_nps->pos_cb(TRUE, pos, vel, acc, mod_nps->userdata);

diff --git a/packaging/lbs-server.changes b/packaging/lbs-server.changes
index a97aa32..44539c7 100644 (file)
--- a/packaging/lbs-server.changes
+++ b/packaging/lbs-server.changes
@@ -1,3 +1,18 @@
+[Version]      lbs-server_0.6.10
+[Date]         12 November 2015
+[Problem]      lbs-server has smack issue because brcm plugin(libbrcm.so) doesn't write data into /run/systemd/journal/dev-log.
+[Solution]     [Workaround] lbs-server will be run by root util smack issue is resolved.
+[Changes]      1. Tizen 2.4 Sync
+               2. Keep the VCONFKEY_LOCATION_REPLAY_ENABLED after loading replay plugin because real GPS plugin can be installed after booting.
+[Developer]    Young-Ae Kang <youngae.kang@samsung.com>
+================================================================================
+
+[Version]      lbs-server_0.6.9
+[Date]         16 Jun 2015
+[Title]                Cynara was applied.
+[Developer]    Young-Ae Kang <youngae.kang@samsung.com>
+================================================================================
+
 [Version]      lbs-server_0.6.8
 [Date]         16 Jun 2015
 [Title]                Cynara was applied.