SVACE fixes 16/214916/1 accepted/tizen_5.5_unified_mobile_hotfix tizen_5.5_mobile_hotfix tizen_5.5_tv accepted/tizen/5.5/unified/20191031.030005 accepted/tizen/5.5/unified/mobile/hotfix/20201027.064454 accepted/tizen/unified/20191006.223600 submit/tizen/20191001.082719 submit/tizen_5.5/20191031.000002 submit/tizen_5.5_mobile_hotfix/20201026.185102 tizen_5.5.m2_release
authorAbhishek Vijay <abhishek.v@samsung.com>
Fri, 27 Sep 2019 12:55:21 +0000 (18:25 +0530)
committerAbhishek Vijay <abhishek.v@samsung.com>
Fri, 27 Sep 2019 12:55:21 +0000 (18:25 +0530)
Change-Id: Ib79006b6c6c3f115fd197774b62a212abbf7b0a7
Signed-off-by: Abhishek Vijay <abhishek.v@samsung.com>
src/battery_monitor_util.c
test/test_cli_app/src/bmt_usage.c

index bbb2a2e..fd1f7eb 100644 (file)
@@ -100,7 +100,7 @@ void unmarshal_serialized_data(GVariant *handle, battery_monitor_total_consumpti
                        _INFO("cpu_val - [%d]", data->cpu_val);
                } else if (g_strcmp0(key, BATTERY_MONITOR_DP_DATA_ID) == 0) {
                        data->dp_val = g_variant_get_int32(value);
-                       _INFO("dp_val - [%d]", data->dp_val);
+                       _INFO("dsp_val - [%d]", data->dp_val);
                } else if (g_strcmp0(key, BATTERY_MONITOR_DN_DATA_ID) == 0) {
                        data->dn_val = g_variant_get_int32(value);
                        _INFO("dn_val - [%d]", data->dn_val);
@@ -111,8 +111,8 @@ void unmarshal_serialized_data(GVariant *handle, battery_monitor_total_consumpti
                        data->hrm_val = g_variant_get_int32(value);
                        _INFO("hrm_val - [%d]", data->hrm_val);
                } else if (g_strcmp0(key, BATTERY_MONITOR_BATTERY_DATA_ID) == 0) {
-                       data->hrm_val = g_variant_get_int32(value);
-                       _INFO("hrm_val - [%d]", data->bat_val);
+                       data->bat_val = g_variant_get_int32(value);
+                       _INFO("bat_val - [%d]", data->bat_val);
                } else {
                        ;
                }
index 9d624df..b20c9c7 100644 (file)
@@ -52,7 +52,7 @@ static gboolean bmt_testapp_get_total_usage_by_app_id()
        int battery_usage = -1;
 
        testapp_print("\n Input AppID using Look Up table:\n");
-       if (0 >= scanf("%s", app_name)) {
+       if (0 >= scanf("%55[^\n]", app_name)) {
                testapp_print("Invalid input ");
                return FALSE;
        }
@@ -119,7 +119,7 @@ static gboolean bmt_testapp_get_total_usage_by_app_id_for_all_resource_id()
        battery_monitor_h data_handle = NULL;
 
        testapp_print("\n Input AppID using Look Up table:\n");
-       if (0 >= scanf("%s", app_name)) {
+       if (0 >= scanf("%55[^\n]", app_name)) {
                testapp_print("Invalid input ");
                return FALSE;
        }
@@ -201,7 +201,7 @@ static gboolean bmt_testapp_get_total_usage_by_app_id_for_resource_id()
        int error_code = BATTERY_MONITOR_ERROR_NONE;
 
        testapp_print("\n Input AppID using Look Up table:\n");
-       if (0 >= scanf("%s", app_name)) {
+       if (0 >= scanf("%55[^\n]", app_name)) {
                testapp_print("Invalid input ");
                return FALSE;
        }