Modified subject of time related items.

Change-Id: Iae7d1ea59e044e54fbd20c84ab4164cbd4d88237
Signed-off-by: Somin Kim <somin926.kim@samsung.com>

diff --git a/include/context_trigger_types_internal.h b/include/context_trigger_types_internal.h
index 6c0913e..b28c179 100644 (file)
--- a/include/context_trigger_types_internal.h
+++ b/include/context_trigger_types_internal.h
@@ -63,7 +63,7 @@
 
 #define CT_RESPONSE "RES"
 
-#define        CT_EVENT_TIME "time/alarm"
+#define CT_EVENT_TIME "device/alarm"
 #define CT_EVENT_BATTERY "system/battery"
 #define CT_EVENT_CHARGER "system/charger"
 #define CT_EVENT_GPS "system/gps"
@@ -79,7 +79,7 @@
 #define CT_EVENT_ACTIVITY_RUNNING "activity/running"
 #define CT_EVENT_ACTIVITY_IN_VEHICLE "activity/in_vehicle"
 #define CT_EVENT_PLACE "place/geofence"
-#define CT_CONDITION_TIME "time/now"
+#define CT_CONDITION_TIME "device/time"
 #define CT_CONDITION_BATTERY "system/battery"
 #define CT_CONDITION_CHARGER "system/charger"
 #define CT_CONDITION_GPS "system/gps"

diff --git a/src/context_trigger.cpp b/src/context_trigger.cpp
index e14badd..cb623ad 100644 (file)
--- a/src/context_trigger.cpp
+++ b/src/context_trigger.cpp
@@ -546,11 +546,6 @@ EXTAPI int context_trigger_rule_event_is_supported(context_trigger_event_e event
        _D("BEGIN");
        ASSERT_NOT_NULL(supported);
 
-       if (event_item == CONTEXT_TRIGGER_EVENT_TIME) {
-               *supported = true;
-               return CONTEXT_TRIGGER_ERROR_NONE;
-       }
-
        *supported = false;
 
        std::string eitem_str = convert_event_to_string(event_item);
@@ -598,11 +593,6 @@ EXTAPI int context_trigger_rule_condition_is_supported(context_trigger_condition
        _D("BEGIN");
        ASSERT_NOT_NULL(supported);
 
-       if (condition_item == CONTEXT_TRIGGER_CONDITION_TIME) {
-               *supported = true;
-               return CONTEXT_TRIGGER_ERROR_NONE;
-       }
-
        *supported = false;
 
        std::string citem_str = convert_condition_to_string(condition_item);

diff --git a/src/rule_info.h b/src/rule_info.h
index 2c3b0cb..3636779 100644 (file)
--- a/src/rule_info.h
+++ b/src/rule_info.h
@@ -19,11 +19,11 @@
 
 #define RULE_INFO "{ \"templates\": [\
                {\
-                       \"name\": \"time/alarm\",\
+                       \"name\": \"device/alarm\",\
                        \"attributes\": [ { \"key\": \"TimeOfDay\", \"type\": 1, \"min\": 0, \"max\": 1439}, { \"key\": \"DayOfWeek\", \"type\": 2, \"acceptable\": [ \"Mon\", \"Tue\", \"Wed\", \"Thu\", \"Fri\", \"Sat\", \"Sun\", \"Weekday\", \"Weekend\" ] } ]\
                },\
                {\
-                       \"name\": \"time/now\",\
+                       \"name\": \"device/time\",\
                        \"attributes\": [ { \"key\": \"TimeOfDay\", \"type\": 1, \"min\": 0, \"max\": 1439}, { \"key\": \"DayOfWeek\", \"type\": 2, \"acceptable\": [ \"Mon\", \"Tue\", \"Wed\", \"Thu\", \"Fri\", \"Sat\", \"Sun\", \"Weekday\", \"Weekend\" ] }, { \"key\" : \"DayOfMonth\", \"type\": 1, \"min\": 1, \"max\": 31} ]\
                },\
                {\