diff options
author | jongmyeongko <jongmyeong.ko@samsung.com> | 2015-11-10 15:13:02 +0900 |
---|---|---|
committer | jongmyeongko <jongmyeong.ko@samsung.com> | 2015-11-10 15:15:07 +0900 |
commit | bfa2e869b69b6ce5214010f082944d22d48587ad (patch) | |
tree | 599c07b34cc08251a89609083d0e69848fadd9db /include | |
parent | d1dba79dace95dce2e5c6a0624a26d6f0576634f (diff) | |
download | application-bfa2e869b69b6ce5214010f082944d22d48587ad.tar.gz application-bfa2e869b69b6ce5214010f082944d22d48587ad.tar.bz2 application-bfa2e869b69b6ce5214010f082944d22d48587ad.zip |
merge tizen 2.4
Change-Id: Ib37db83efd77b8281beeee6c7e17702db9ebbc16
Signed-off-by: jongmyeongko <jongmyeong.ko@samsung.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/app_event.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/include/app_event.h b/include/app_event.h index 61b0588..706b506 100644 --- a/include/app_event.h +++ b/include/app_event.h @@ -79,29 +79,39 @@ typedef enum * @see EVENT_VAL_BATTERY_CHARGER_DISCONNECTED * @see EVENT_VAL_BATTERY_CHARGER_CONNECTED * @see EVENT_VAL_BATTERY_CHARGER_CHARGING + * @see EVENT_VAL_BATTERY_CHARGER_DISCHARGING */ #define EVENT_KEY_BATTERY_CHARGER_STATUS "battery_charger_status" /** * @brief Definition for value of EVENT_KEY_BATTERY_CHARGER_STATUS. * @since_tizen 2.4 + * @remarks charger disconnected */ #define EVENT_VAL_BATTERY_CHARGER_DISCONNECTED "disconnected" /** * @brief Definition for value of EVENT_KEY_BATTERY_CHARGER_STATUS. * @since_tizen 2.4 - * @remarks Connected but not-available. + * @remarks charger connected */ #define EVENT_VAL_BATTERY_CHARGER_CONNECTED "connected" /** * @brief Definition for value of EVENT_KEY_BATTERY_CHARGER_STATUS. * @since_tizen 2.4 + * @remarks charging is enabled */ #define EVENT_VAL_BATTERY_CHARGER_CHARGING "charging" /** + * @brief Definition for value of EVENT_KEY_BATTERY_CHARGER_STATUS. + * @since_tizen 2.4 + * @remarks charging is disabled + */ +#define EVENT_VAL_BATTERY_CHARGER_DISCHARGING "discharging" + +/** * @brief Definition for system-event of battery : level status. * @since_tizen 2.4 * @see EVENT_KEY_BATTERY_LEVEL_STATUS @@ -778,6 +788,8 @@ typedef enum * @retval #EVENT_ERROR_NONE Successful * @retval #EVENT_ERROR_INVALID_PARAMETER Invalid parameter * @retval #EVENT_ERROR_PERMISSION_DENIED Permission denied + * @retval #EVENT_ERROR_IO_ERROR Adding handler failed + * @retval #EVENT_ERROR_OUT_OF_MEMORY Out of memory */ int event_add_event_handler(const char *event_name, event_cb callback, void *user_data, event_handler_h *event_handler); |