Remove camera status information

Change-Id: I849b1ae14673941fde1ca60a4233480897a60a89
Signed-off-by: Vyacheslav Cherkashin <v.cherkashin@samsung.com>

diff --git a/daemon/da_data.c b/daemon/da_data.c
index 5082ff5ac2876d7ee62e41d8b01914ede53d5b1b..032e09847de69023bd2e24dbda31273977749b2a 100644 (file)
--- a/daemon/da_data.c
+++ b/daemon/da_data.c
@@ -43,7 +43,6 @@ int print_sys_info(struct system_info_t * sys_info)
        sys_info->gps_status=0x4;
        sys_info->brightness_status=0x5;
 
-       sys_info->camera_status=0x6;
        sys_info->sound_status=0x7;
        sys_info->audio_status=0x8;
        sys_info->vibration_status=0x9;
@@ -88,7 +87,6 @@ int print_sys_info(struct system_info_t * sys_info)
        gps_status = 0x%X\n\
        brightness_status = 0x%X\n\
 \
-       camera_status = 0x%X\n\
        sound_status = 0x%X\n\
        audio_status = 0x%X\n\
        vibration_status = 0x%X\n\
@@ -130,7 +128,6 @@ int print_sys_info(struct system_info_t * sys_info)
        sys_info->gps_status,
        sys_info->brightness_status,
 
-       sys_info->camera_status,
        sys_info->sound_status,
        sys_info->audio_status,
        sys_info->vibration_status,

diff --git a/daemon/da_protocol.h b/daemon/da_protocol.h
index 7f78195978ccc923d1d46a8e22607c1b6fbcfb65..730eda3832255faac952834d9c639a56707abd66 100644 (file)
--- a/daemon/da_protocol.h
+++ b/daemon/da_protocol.h
@@ -404,7 +404,6 @@ struct system_info_t {
        uint32_t bt_status;
        uint32_t gps_status;
        uint32_t brightness_status;
-       uint32_t camera_status;
        uint32_t sound_status;
        uint32_t audio_status;
        uint32_t vibration_status;

diff --git a/daemon/device_vconf.c b/daemon/device_vconf.c
index ff4a9d6fdf32950b729d843444a817bc04f23897..2120ac239654ddef4e7dc3ef37471b3c5f91bc9d 100644 (file)
--- a/daemon/device_vconf.c
+++ b/daemon/device_vconf.c
@@ -154,17 +154,6 @@ int get_dnet_status(void)
        return dnet_status;
 }
 
-int get_camera_status(void)
-{
-       int camera_status = 0;
-
-       if (vconf_get_int(VCONFKEY_CAMERA_STATE, &camera_status) < 0) {
-               camera_status = VCONFKEY_CAMERA_STATE_NULL;
-       }
-
-       return camera_status;
-}
-
 int get_sound_status(void)
 {
        int sound_status = 0;

diff --git a/daemon/device_vconf.h b/daemon/device_vconf.h
index 0bb965a878209d52d958220f79ad6cf998135971..3bf4cf0426a3df5b11636b358156fbfc1da3cbfc 100644 (file)
--- a/daemon/device_vconf.h
+++ b/daemon/device_vconf.h
@@ -37,7 +37,6 @@ int get_gps_status(void);
 int get_rssi_status(void);
 int get_call_status(void);
 int get_dnet_status(void);
-int get_camera_status(void);
 int get_sound_status(void);
 int get_audio_status(void);
 int get_vibration_status(void);

diff --git a/daemon/sys_stat.c b/daemon/sys_stat.c
index cc6cec082cf867b401755426e5d4ee9da21e4885..8b375d66740bc7e099a6bcac0e62481cbae8d913 100644 (file)
--- a/daemon/sys_stat.c
+++ b/daemon/sys_stat.c
@@ -2468,7 +2468,6 @@ int get_system_info(struct system_info_t *sys_info)
                sys_info->bt_status = get_bt_status();
                sys_info->gps_status = get_gps_status();
                sys_info->brightness_status = get_brightness_status();
-               sys_info->camera_status = get_camera_status();
                sys_info->sound_status = get_sound_status();
                sys_info->audio_status = get_audio_status();
                sys_info->vibration_status = get_vibration_status();
@@ -2833,7 +2832,7 @@ struct msg_data_t *pack_system_info(struct system_info_t *sys_info)
        pack_int32(p, sys_info->bt_status);
        pack_int32(p, sys_info->gps_status);
        pack_int32(p, sys_info->brightness_status);
-       pack_int32(p, sys_info->camera_status);
+       pack_int32(p, 0);       /* stub of deprecated camera status */
        pack_int32(p, sys_info->sound_status);
        pack_int32(p, sys_info->audio_status);
        pack_int32(p, sys_info->vibration_status);

diff --git a/docs/protocol.rst b/docs/protocol.rst
index bb34ffdd6123451dca1777b0dde26de3f89ec67b..407b5086a317dde7c01987b47bd189b9c83f062b 100644 (file)
--- a/docs/protocol.rst
+++ b/docs/protocol.rst
@@ -344,7 +344,7 @@ Features
 +------------------------------------+-----------------+------------------------------------------------------------------+-------------------------------------+
 | system network                     | 0x40000000000   | network send/recv size                                           | :ref:`msg_system`                   |
 +------------------------------------+-----------------+------------------------------------------------------------------+-------------------------------------+
-| system device                      | 0x80000000000   | WiFi, BT, GPS, brightness, camera, sound, audio, voltage and etc | :ref:`msg_system`                   |
+| system device                      | 0x80000000000   | WiFi, BT, GPS, brightness, sound, audio, voltage and etc         | :ref:`msg_system`                   |
 +------------------------------------+-----------------+------------------------------------------------------------------+-------------------------------------+
 | system energy                      | 0x100000000000  | energy usage (total, per devices, by application)                | :ref:`msg_system`                   |
 +------------------------------------+-----------------+------------------------------------------------------------------+-------------------------------------+
@@ -730,7 +730,7 @@ MSG\_SYSTEM
 +----------------------------------------+----------+-----------------------+-----------------------------------------------------------------------------------+
 | Brightness status                      | uint32   | number                | brightness level from vconf                                                       |
 +----------------------------------------+----------+-----------------------+-----------------------------------------------------------------------------------+
-| Camera status                          | uint32   | number                | camera state from vconf                                                           |
+| Reserved                               | uint32   | number                | deprecated 'camera status'                                                        |
 +----------------------------------------+----------+-----------------------+-----------------------------------------------------------------------------------+
 | Sound status                           | uint32   | number                | sound level from vconf                                                            |
 +----------------------------------------+----------+-----------------------+-----------------------------------------------------------------------------------+