sensord: remove useless privilege and macros

Change-Id: I373f5645cbdf318f397e2e3e47bc0f98b46e94ad
Signed-off-by: kibak.yoon <kibak.yoon@samsung.com>

diff --git a/include/sensor_types.h b/include/sensor_types.h
index 5342f23..9c9426c 100644 (file)
--- a/include/sensor_types.h
+++ b/include/sensor_types.h
@@ -60,9 +60,6 @@ extern "C"
 #define SENSOR_UNKNOWN_TYPE "http://tizen.org/sensor/unknown"
 #define SENSOR_UNKNOWN_NAME "Unknown"
 
-#define PRIV_APPLICATION_SENSOR "http://tizen.org/privilege/applicationsensor"
-#define PRIV_APPLICATION_SENSOR_WRITE "http://tizen.org/privilege/applicationsensor.write"
-
 typedef int64_t sensor_id_t;
 typedef void *sensor_t;
 

diff --git a/src/client/sensor_manager.cpp b/src/client/sensor_manager.cpp
index 1f66ac4..43fcb41 100644 (file)
--- a/src/client/sensor_manager.cpp
+++ b/src/client/sensor_manager.cpp
@@ -29,8 +29,6 @@
 
 #include "sensor_manager_channel_handler.h"
 
-#define SIZE_STR_SENSOR_ALL 27
-
 using namespace sensor;
 
 sensor_manager::sensor_manager()
@@ -97,7 +95,7 @@ bool sensor_manager::is_supported(sensor_t sensor)
 
 bool sensor_manager::is_supported(const char *uri)
 {
-       if (strncmp(uri, utils::get_uri(ALL_SENSOR), SIZE_STR_SENSOR_ALL) == 0)
+       if (strncmp(uri, utils::get_uri(ALL_SENSOR), strlen(utils::get_uri(ALL_SENSOR))) == 0)
                return true;
 
        for (auto it = m_sensors.begin(); it != m_sensors.end(); ++it) {
@@ -337,7 +335,7 @@ bool sensor_manager::has_privilege(std::string &uri)
 
 sensor_info *sensor_manager::get_info(const char *uri)
 {
-       if (strncmp(uri, utils::get_uri(ALL_SENSOR), SIZE_STR_SENSOR_ALL) == 0)
+       if (strncmp(uri, utils::get_uri(ALL_SENSOR), strlen(utils::get_uri(ALL_SENSOR))) == 0)
                return &m_sensors[0];
 
        for (auto it = m_sensors.begin(); it != m_sensors.end(); ++it) {
@@ -369,7 +367,7 @@ std::vector<sensor_info *> sensor_manager::get_infos(const char *uri)
        std::vector<sensor_info *> infos;
        bool all = false;
 
-       if (strncmp(uri, utils::get_uri(ALL_SENSOR), SIZE_STR_SENSOR_ALL) == 0)
+       if (strncmp(uri, utils::get_uri(ALL_SENSOR), strlen(utils::get_uri(ALL_SENSOR))) == 0)
                all = true;
 
        for (auto it = m_sensors.begin(); it != m_sensors.end(); ++it) {

diff --git a/src/client/sensor_provider.cpp b/src/client/sensor_provider.cpp
index abfd9e1..5d0b1c9 100644 (file)
--- a/src/client/sensor_provider.cpp
+++ b/src/client/sensor_provider.cpp
@@ -59,7 +59,6 @@ bool sensor_provider::init(const char *uri)
        m_sensor.set_min_range(0);
        m_sensor.set_max_range(1);
        m_sensor.set_resolution(1);
-       m_sensor.set_privilege(PRIV_APPLICATION_SENSOR);
 
        return true;
 }

diff --git a/src/server/server_channel_handler.cpp b/src/server/server_channel_handler.cpp
index 9c908fd..88c48e4 100644 (file)
--- a/src/server/server_channel_handler.cpp
+++ b/src/server/server_channel_handler.cpp
@@ -315,9 +315,6 @@ int server_channel_handler::listener_get_data(channel *ch, message &msg)
 
 int server_channel_handler::provider_connect(channel *ch, message &msg)
 {
-       retvm_if(!has_privileges(ch->get_fd(), PRIV_APPLICATION_SENSOR_WRITE),
-                       -EACCES, "Permission denied");
-
        sensor_info info;
        info.clear();
        info.deserialize(msg.body(), msg.size());