Merge "Parameter Check Correction" into tizen

diff --git a/src/battery_monitor.c b/src/battery_monitor.c
index 7a87a7c..7a04310 100644 (file)
--- a/src/battery_monitor.c
+++ b/src/battery_monitor.c
@@ -134,9 +134,11 @@ BM_API int battery_monitor_create(battery_monitor_h *handle)
        data_handle->cpu_val = 0;
        data_handle->dp_val = 0;
        data_handle->dn_val = 0;
+#ifdef DISABLE_FEATURE_DATA_FROM_GPS_HRM_PLUGIN
        data_handle->gps_val = 0;
        data_handle->hrm_val = 0;
        data_handle->bat_val = 0;
+#endif /* DISABLE_FEATURE_DATA_FROM_GPS_HRM_PLUGIN */
 
        *handle = (battery_monitor_h)data_handle;
 
@@ -193,6 +195,7 @@ BM_API int battery_monitor_get_usage_for_resource_id(battery_monitor_h handle, b
        case BATTERY_MONITOR_RESOURCE_ID_DEVICE_NETWORK:
                *battery_usage = data_handle->dn_val;
                break;
+#ifdef DISABLE_FEATURE_DATA_FROM_GPS_HRM_PLUGIN
        case BATTERY_MONITOR_RESOURCE_ID_GPS_SENSOR:
                *battery_usage = data_handle->gps_val;
                break;
@@ -202,6 +205,7 @@ BM_API int battery_monitor_get_usage_for_resource_id(battery_monitor_h handle, b
        case BATTERY_MONITOR_RESOURCE_ID_BATTERY:
                *battery_usage = data_handle->bat_val;
                break;
+ #endif /* DISABLE_FEATURE_DATA_FROM_GPS_HRM_PLUGIN */
        default:
                break;
        }

diff --git a/test/test_cli_app/src/bmt_usage.c b/test/test_cli_app/src/bmt_usage.c
index 1b5682a..a32fe99 100644 (file)
--- a/test/test_cli_app/src/bmt_usage.c
+++ b/test/test_cli_app/src/bmt_usage.c
@@ -136,8 +136,11 @@ static gboolean bmt_testapp_get_total_usage_by_app_id_for_all_resource_id()
                testapp_print ("Valid Handle Received, Value of error_code is [%d] \n", error_code);
 
                int battery_usage;
+#ifdef DISABLE_FEATURE_DATA_FROM_GPS_HRM_PLUGIN
                for (int id = BATTERY_MONITOR_RESOURCE_ID_BLE; id < BATTERY_MONITOR_RESOURCE_ID_MAX; id++) {
-
+#else
+               for (int id = BATTERY_MONITOR_RESOURCE_ID_BLE; id <= BATTERY_MONITOR_RESOURCE_ID_DEVICE_NETWORK; ++id) {
+#endif
                        battery_usage = -1;
                        error_code = battery_monitor_get_usage_for_resource_id(data_handle, id, &battery_usage);
 
@@ -162,12 +165,14 @@ static gboolean bmt_testapp_get_total_usage_by_app_id_for_all_resource_id()
                        case BATTERY_MONITOR_RESOURCE_ID_DEVICE_NETWORK:
                                testapp_print ("Resource ID : DEVICE NETWORK App Usage Value = [%d] \n", battery_usage);
                                break;
+#ifdef DISABLE_FEATURE_DATA_FROM_GPS_HRM_PLUGIN
                        case BATTERY_MONITOR_RESOURCE_ID_GPS_SENSOR:
                                testapp_print ("Resource ID : GPS App Usage Value = [%d] \n", battery_usage);
                                break;
                        case BATTERY_MONITOR_RESOURCE_ID_HRM_SENSOR:
                                testapp_print ("Resource ID : HRM App Usage Value = [%d] \n", battery_usage);
                                break;
+#endif /* DISABLE_FEATURE_DATA_FROM_GPS_HRM_PLUGIN */
                        default:
                                break;
                        }

diff --git a/test/test_cli_app/src/bmt_utility.c b/test/test_cli_app/src/bmt_utility.c
index d7510d2..93eaec9 100644 (file)
--- a/test/test_cli_app/src/bmt_utility.c
+++ b/test/test_cli_app/src/bmt_utility.c
@@ -72,8 +72,10 @@ void testapp_show_menu(battery_monitor_menu_e menu)
                testapp_print(" 2 ==> BM_RESOURCE_ID_CPU \n");
                testapp_print(" 3 ==> BM_RESOURCE_ID_DISPLAY \n");
                testapp_print(" 4 ==> BM_RESOURCE_ID_DEVICE_NETWORK \n");
+#ifdef DISABLE_FEATURE_DATA_FROM_GPS_HRM_PLUGIN
                testapp_print(" 5 ==> BM_RESOURCE_ID_GPS_SENSOR \n");
                testapp_print(" 6 ==> BM_RESOURCE_ID_HRM_SENSOR \n");
+ #endif /* DISABLE_FEATURE_DATA_FROM_GPS_HRM_PLUGIN */
                testapp_print("==========================================\n");
                testapp_print("    TIME LOOK UP TABLE \n");
                testapp_print("==========================================\n");