Added 3.0 notification.

 - add new privilige(http://tizen.org/privilege/location.coarse) for cell location

Change-Id: Ie54ba6038a759d05db7f45434b2fd7b2278de50e

diff --git a/include/telephony_common.h b/include/telephony_common.h
index 9215a03a86a4c6d0cdd8638e5c37c0e7f00fa3fd..9dad44ff6de98d417c303436eac8b2f052706379 100644 (file)
--- a/include/telephony_common.h
+++ b/include/telephony_common.h
@@ -51,8 +51,8 @@ typedef struct telephony_data *telephony_h;
  * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif
  */
 typedef struct {
-    unsigned int count; /**< Number of available handle */
-    telephony_h *handle; /**< Handle to use Telephony API */
+       unsigned int count; /**< Number of available handle */
+       telephony_h *handle; /**< Handle to use Telephony API */
 } telephony_handle_list_s;
 
 /**
@@ -60,13 +60,13 @@ typedef struct {
  * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif
  */
 typedef enum {
-    TELEPHONY_ERROR_NONE = TIZEN_ERROR_NONE,                            /**< Successful */
-    TELEPHONY_ERROR_OUT_OF_MEMORY = TIZEN_ERROR_OUT_OF_MEMORY,          /**< Out of memory */
-    TELEPHONY_ERROR_INVALID_PARAMETER = TIZEN_ERROR_INVALID_PARAMETER,  /**< Invalid parameter */
-    TELEPHONY_ERROR_PERMISSION_DENIED = TIZEN_ERROR_PERMISSION_DENIED,  /**< Permission denied */
-    TELEPHONY_ERROR_NOT_SUPPORTED = TIZEN_ERROR_NOT_SUPPORTED,          /**< Not supported */
-    TELEPHONY_ERROR_OPERATION_FAILED = TIZEN_ERROR_TELEPHONY | 0x0001,  /**< Operation failed */
-    TELEPHONY_ERROR_SIM_NOT_AVAILABLE = TIZEN_ERROR_TELEPHONY | 0x1001, /**< SIM is not available */
+       TELEPHONY_ERROR_NONE = TIZEN_ERROR_NONE,                            /**< Successful */
+       TELEPHONY_ERROR_OUT_OF_MEMORY = TIZEN_ERROR_OUT_OF_MEMORY,          /**< Out of memory */
+       TELEPHONY_ERROR_INVALID_PARAMETER = TIZEN_ERROR_INVALID_PARAMETER,  /**< Invalid parameter */
+       TELEPHONY_ERROR_PERMISSION_DENIED = TIZEN_ERROR_PERMISSION_DENIED,  /**< Permission denied */
+       TELEPHONY_ERROR_NOT_SUPPORTED = TIZEN_ERROR_NOT_SUPPORTED,          /**< Not supported */
+       TELEPHONY_ERROR_OPERATION_FAILED = TIZEN_ERROR_TELEPHONY | 0x0001,  /**< Operation failed */
+       TELEPHONY_ERROR_SIM_NOT_AVAILABLE = TIZEN_ERROR_TELEPHONY | 0x1001, /**< SIM is not available */
 } telephony_error_e;
 
 /**
@@ -74,32 +74,101 @@ typedef enum {
  * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif
  */
 typedef enum  {
-    TELEPHONY_NOTI_SIM_STATUS = 0x10,            /**< Notification to be invoked when the SIM card state changes, '#telephony_sim_state_e' will be delivered in notification data */
-    TELEPHONY_NOTI_SIM_CALL_FORWARDING_INDICATOR_STATE, /**< Notification to be invoked when the SIM call forwarding indicator state changes, 'state(bool)' will be delivered in notification data (@b Since: 3.0) */
+       TELEPHONY_NOTI_SIM_STATUS = 0x10,                               /**< Notification to be invoked when the SIM card state changes. @n
+                                                                       '#telephony_sim_state_e' will be delivered in notification data @n
+                                                                       Privilege : http://tizen.org/privilege/telephony */
+       TELEPHONY_NOTI_SIM_CALL_FORWARDING_INDICATOR_STATE,     /**< Notification to be invoked when the SIM call forwarding indicator state changes. @n
+                                                                       'state(bool)' will be delivered in notification data (@b Since: 3.0) @n
+                                                                       Privilege : http://tizen.org/privilege/telephony */
 
-    TELEPHONY_NOTI_NETWORK_SERVICE_STATE = 0x20, /**< Notification to be invoked when the network service state changes, '#telephony_network_service_state_e' will be delivered in notification data */
-    TELEPHONY_NOTI_NETWORK_CELLID,               /**< Notification to be invoked when the cell ID changes, 'cell_id(int)' will be delivered in notification data */
-    TELEPHONY_NOTI_NETWORK_ROAMING_STATUS,       /**< Notification to be invoked when the roaming status changes, 'roaming_status(bool)' will be delivered in notification data */
-    TELEPHONY_NOTI_NETWORK_SIGNALSTRENGTH_LEVEL, /**< Notification to be invoked when the signal strength changes, '#telephony_network_rssi_e' will be delivered in notification data */
-    TELEPHONY_NOTI_NETWORK_NETWORK_NAME, /**< Notification to be invoked when the network name changes, 'network_name(char *)' wil be delivered in notification data (@b Since: 2.4) */
-    TELEPHONY_NOTI_NETWORK_PS_TYPE, /**< Notification to be invoked when the ps type changes, '#telephony_network_ps_type_e' will be delivered in notification data (@b Since: 2.4) */
-    TELEPHONY_NOTI_NETWORK_DEFAULT_DATA_SUBSCRIPTION, /**< Notification to be invoked when the default data subscription changes, '#telephony_network_default_data_subs_e' wil be delivered in notification data (@b Since: 2.4) */
-    TELEPHONY_NOTI_NETWORK_DEFAULT_SUBSCRIPTION, /**< Notification to be invoked when the default subscription changes, '#telephony_network_default_subs_e' will be delivered in notification data (@b Since: 2.4) */
+       TELEPHONY_NOTI_NETWORK_SERVICE_STATE = 0x20,            /**< Notification to be invoked when the network service state changes. @n
+                                                                       '#telephony_network_service_state_e' will be delivered in notification data @n
+                                                                       Privilege : http://tizen.org/privilege/telephony */
+       TELEPHONY_NOTI_NETWORK_CELLID,                          /**< Notification to be invoked when the cell ID changes. @n
+                                                                       'cell_id(int)' will be delivered in notification data @n
+                                                                       Privilege : http://tizen.org/privilege/location.coarse (@b Since: 3.0) */
+       TELEPHONY_NOTI_NETWORK_ROAMING_STATUS,                  /**< Notification to be invoked when the roaming status changes. @n
+                                                                       'roaming_status(bool)' will be delivered in notification data @n
+                                                                       Privilege : http://tizen.org/privilege/telephony */
+       TELEPHONY_NOTI_NETWORK_SIGNALSTRENGTH_LEVEL,            /**< Notification to be invoked when the signal strength changes. @n
+                                                                       '#telephony_network_rssi_e' will be delivered in notification data @n
+                                                                       Privilege : http://tizen.org/privilege/telephony */
+       TELEPHONY_NOTI_NETWORK_NETWORK_NAME,                    /**< Notification to be invoked when the network name changes. @n
+                                                                       'network_name(char *)' wil be delivered in notification data (@b Since: 2.4) @n
+                                                                       Privilege : http://tizen.org/privilege/telephony */
+       TELEPHONY_NOTI_NETWORK_PS_TYPE,                         /**< Notification to be invoked when the ps type changes. @n
+                                                                       '#telephony_network_ps_type_e' will be delivered in notification data (@b Since: 2.4) @n
+                                                                       Privilege : http://tizen.org/privilege/telephony */
+       TELEPHONY_NOTI_NETWORK_DEFAULT_DATA_SUBSCRIPTION,       /**< Notification to be invoked when the default data subscription changes. @n
+                                                                       '#telephony_network_default_data_subs_e' wil be delivered in notification data (@b Since: 2.4) @n
+                                                                       Privilege : http://tizen.org/privilege/telephony */
+       TELEPHONY_NOTI_NETWORK_DEFAULT_SUBSCRIPTION,            /**< Notification to be invoked when the default subscription changes. @n
+                                                                       '#telephony_network_default_subs_e' will be delivered in notification data (@b Since: 2.4) @n
+                                                                       Privilege : http://tizen.org/privilege/telephony */
+       TELEPHONY_NOTI_NETWORK_LAC,                             /**< Notification to be invoked when the LAC (Location Area Code) changes. @n
+                                                                       'lac(int)' will be delivered in notification data (@b Since: 3.0) @n
+                                                                       Privilege : http://tizen.org/privilege/location.coarse */
+       TELEPHONY_NOTI_NETWORK_TAC,                                     /**< Notification to be invoked when the TAC (Tracking Area Code) changes. @n
+                                                                       'tac(int)' will be delivered in notification data (@b Since: 3.0) @n
+                                                                       Privilege : http://tizen.org/privilege/location.coarse */
+       TELEPHONY_NOTI_NETWORK_SYSTEM_ID,                               /**< Notification to be invoked when the system ID changes. @n
+                                                                       'sid(int)' will be delivered in notification data (@b Since: 3.0) @n
+                                                                       Privilege : http://tizen.org/privilege/location.coarse */
+       TELEPHONY_NOTI_NETWORK_NETWORK_ID,                      /**< Notification to be invoked when the network ID changes. @n
+                                                                       'nid(int)' will be delivered in notification data (@b Since: 3.0) @n
+                                                                       Privilege : http://tizen.org/privilege/location.coarse */
+       TELEPHONY_NOTI_NETWORK_BS_ID,                           /**< Notification to be invoked when the base station ID changes. @n
+                                                                       'bs_id(int)' will be delivered in notification data (@b Since: 3.0) @n
+                                                                       Privilege : http://tizen.org/privilege/location.coarse */
+       TELEPHONY_NOTI_NETWORK_BS_LATITUDE,                     /**< Notification to be invoked when the base station latitude changes. @n
+                                                                       'bs_latitude(int)' will be delivered in notification data (@b Since: 3.0) @n
+                                                                       Privilege : http://tizen.org/privilege/location.coarse */
+       TELEPHONY_NOTI_NETWORK_BS_LONGITUDE,                    /**< Notification to be invoked when the base station longitude changes. @n
+                                                                       'bs_longitue(int)' will be delivered in notification data (@b Since: 3.0) @n
+                                                                       Privilege : http://tizen.org/privilege/location.coarse */
 
-    TELEPHONY_NOTI_VOICE_CALL_STATE = 0x30,      /**< Notification to be invoked when the voice call state changes, '#telephony_call_state_e' will be delivered in notification data (Deprecated Since 2.4. Use #TELEPHONY_NOTI_VOICE_CALL_STATUS_XXX instead.) */
-    TELEPHONY_NOTI_VIDEO_CALL_STATE,              /**< Notification to be invoked when the video call state changes, '#telephony_call_state_e' will be delivered in notification data (Deprecated Since 2.4. Use #TELEPHONY_NOTI_VIDEO_CALL_STATUS_XXX instead.) */
-    TELEPHONY_NOTI_VOICE_CALL_STATUS_IDLE, /**< Notification to be invoked when a voice call is in idle status, 'handle_id(unsigned int)' will be delivered in notification data (@b Since: 2.4) */
-    TELEPHONY_NOTI_VOICE_CALL_STATUS_ACTIVE, /**< Notification to be invoked when a voice call is in active status, 'handle_id(unsigned int)' will be delivered in notification data (@b Since: 2.4) */
-    TELEPHONY_NOTI_VOICE_CALL_STATUS_HELD, /**< Notification to be invoked when a voice call is in held status, 'handle_id(unsigned int)' will be delivered in notification data (@b Since: 2.4) */
-    TELEPHONY_NOTI_VOICE_CALL_STATUS_DIALING, /**< Notification to be invoked when a voice call is in dialing status, 'handle_id(unsigned int)' will be delivered in notification data (@b Since: 2.4) */
-    TELEPHONY_NOTI_VOICE_CALL_STATUS_ALERTING, /**< Notification to be invoked when a voice call is in alerting status, 'handle_id(unsigned int)' will be delivered in notification data (@b Since: 2.4) */
-    TELEPHONY_NOTI_VOICE_CALL_STATUS_INCOMING, /**< Notification to be invoked when a voice call is in incoming status, 'handle_id(unsigned int)' will be delivered in notification data (@b Since: 2.4) */
-    TELEPHONY_NOTI_VIDEO_CALL_STATUS_IDLE, /**< Notification to be invoked when a video call is in idle status, 'handle_id(unsigned int)' will be delivered in notification data (@b Since: 2.4) */
-    TELEPHONY_NOTI_VIDEO_CALL_STATUS_ACTIVE, /**< Notification to be invoked when a video call is in active status, 'handle_id(unsigned int)' will be delivered in notification data (@b Since: 2.4) */
-    TELEPHONY_NOTI_VIDEO_CALL_STATUS_DIALING, /**< Notification to be invoked when a video call is in dialing status, 'handle_id(unsigned int)' will be delivered in notification data (@b Since: 2.4) */
-    TELEPHONY_NOTI_VIDEO_CALL_STATUS_ALERTING, /**< Notification to be invoked when a video call is in alerting status, 'handle_id(unsigned int)' will be delivered in notification data (@b Since: 2.4) */
-    TELEPHONY_NOTI_VIDEO_CALL_STATUS_INCOMING, /**< Notification to be invoked when a video call is in incoming status, 'handle_id(unsigned int)' will be delivered in notification data (@b Since: 2.4) */
-    TELEPHONY_NOTI_CALL_PREFERRED_VOICE_SUBSCRIPTION /**< Notification to be invoked when the preferred voice subscription changes, '#telephony_call_preferred_voice_subs_e' will be delivered in notification data (@b Since: 2.4) */
+       TELEPHONY_NOTI_VOICE_CALL_STATE = 0x30,                 /**< Notification to be invoked when the voice call state changes. @n
+                                                                       '#telephony_call_state_e' will be delivered in notification data (Deprecated Since 2.4. Use #TELEPHONY_NOTI_VOICE_CALL_STATUS_XXX instead.) @n
+                                                                       Privilege : http://tizen.org/privilege/telephony */
+       TELEPHONY_NOTI_VIDEO_CALL_STATE,                                /**< Notification to be invoked when the video call state changes. @n
+                                                                       '#telephony_call_state_e' will be delivered in notification data (Deprecated Since 2.4. Use #TELEPHONY_NOTI_VIDEO_CALL_STATUS_XXX instead.) @n
+                                                                       Privilege : http://tizen.org/privilege/telephony */
+       TELEPHONY_NOTI_VOICE_CALL_STATUS_IDLE,                  /**< Notification to be invoked when a voice call is in idle status. @n
+                                                                       'handle_id(unsigned int)' will be delivered in notification data (@b Since: 2.4) @n
+                                                                       Privilege : http://tizen.org/privilege/telephony */
+       TELEPHONY_NOTI_VOICE_CALL_STATUS_ACTIVE,                        /**< Notification to be invoked when a voice call is in active status. @n
+                                                                       'handle_id(unsigned int)' will be delivered in notification data (@b Since: 2.4) @n
+                                                                       Privilege : http://tizen.org/privilege/telephony */
+       TELEPHONY_NOTI_VOICE_CALL_STATUS_HELD,                  /**< Notification to be invoked when a voice call is in held status. @n
+                                                                       'handle_id(unsigned int)' will be delivered in notification data (@b Since: 2.4) @n
+                                                                       Privilege : http://tizen.org/privilege/telephony */
+       TELEPHONY_NOTI_VOICE_CALL_STATUS_DIALING,                       /**< Notification to be invoked when a voice call is in dialing status. @n
+                                                                       'handle_id(unsigned int)' will be delivered in notification data (@b Since: 2.4) @n
+                                                                       Privilege : http://tizen.org/privilege/telephony */
+       TELEPHONY_NOTI_VOICE_CALL_STATUS_ALERTING,                      /**< Notification to be invoked when a voice call is in alertingstatus. @n
+                                                                       'handle_id(unsigned int)' will be delivered in notification data (@b Since: 2.4) @n
+                                                                       Privilege : http://tizen.org/privilege/telephony */
+       TELEPHONY_NOTI_VOICE_CALL_STATUS_INCOMING,              /**< Notification to be invoked when a voice call is in incoming status. @n
+                                                                       'handle_id(unsigned int)' will be delivered in notification data (@b Since: 2.4) @n
+                                                                       Privilege : http://tizen.org/privilege/telephony */
+       TELEPHONY_NOTI_VIDEO_CALL_STATUS_IDLE,                  /**< Notification to be invoked when a video call is in idle status. @n
+                                                                       'handle_id(unsigned int)' will be delivered in notification data (@b Since: 2.4) @n
+                                                                       Privilege : http://tizen.org/privilege/telephony */
+       TELEPHONY_NOTI_VIDEO_CALL_STATUS_ACTIVE,                        /**< Notification to be invoked when a video call is in active status. @n
+                                                                       'handle_id(unsigned int)' will be delivered in notification data (@b Since: 2.4) @n
+                                                                       Privilege : http://tizen.org/privilege/telephony */
+       TELEPHONY_NOTI_VIDEO_CALL_STATUS_DIALING,                       /**< Notification to be invoked when a video call is in dialing status. @n
+                                                                       'handle_id(unsigned int)' will be delivered in notification data (@b Since: 2.4) @n
+                                                                       Privilege : http://tizen.org/privilege/telephony */
+       TELEPHONY_NOTI_VIDEO_CALL_STATUS_ALERTING,                      /**< Notification to be invoked when a video call is in alerting status. @n
+                                                                       'handle_id(unsigned int)' will be delivered in notification data (@b Since: 2.4) @n
+                                                                       Privilege : http://tizen.org/privilege/telephony */
+       TELEPHONY_NOTI_VIDEO_CALL_STATUS_INCOMING,              /**< Notification to be invoked when a video call is in incoming status. @n
+                                                                       'handle_id(unsigned int)' will be delivered in notification data (@b Since: 2.4) @n
+                                                                       Privilege : http://tizen.org/privilege/telephony */
+       TELEPHONY_NOTI_CALL_PREFERRED_VOICE_SUBSCRIPTION                /**< Notification to be invoked when the preferred voice subscription changes. @n
+                                                                       '#telephony_call_preferred_voice_subs_e' will be delivered in notification data (@b Since: 2.4) @n
+                                                                       Privilege : http://tizen.org/privilege/telephony */
 } telephony_noti_e;
 
 /**
@@ -112,10 +181,10 @@ typedef void (*telephony_noti_cb)(telephony_h handle, telephony_noti_e noti_id,
  * @brief Sets a callback function to be invoked when the telephony state changes.
  *
  * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif
- * @privlevel public
- * @privilege %http://tizen.org/privilege/telephony
  *
- * @remarks If applications have no corresponding privilege for this API, callback will not be invoked although API returns success.
+ * @remarks An application should have the privilege corresponding to each notificaiton id. \n
+ *     Please see the #telephony_noti_e to know the privilege. \n
+ *     If an application has no proper privilege, callback will not be invoked although API returns success.
  *
  * @param[in] handle  The handle to use the telephony API
  * @param[in] noti_id The notification ID to set the callback
@@ -141,12 +210,8 @@ int telephony_set_noti_cb(telephony_h handle,
  * @brief Unsets a callback function.
  *
  * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif
- * @privlevel public
- * @privilege %http://tizen.org/privilege/telephony
  *
- * @remarks If applications have no corresponding privilege for this API, callback will not be invoked although API returns success.
- *
- * @param[in] handle  The handle to use the telephony API
+ * @param[in] handle The handle to use the telephony API
  * @param[in] noti_id The notification ID to unset a callback
  *
  * @return @c 0 on success,
@@ -208,8 +273,8 @@ int telephony_deinit(telephony_handle_list_s *list);
  * @since_tizen 2.4
  */
 typedef enum {
-    TELEPHONY_STATE_NOT_READY, /**< Telephony state is not ready */
-    TELEPHONY_STATE_READY, /**< Telephony state is ready */
+       TELEPHONY_STATE_NOT_READY, /**< Telephony state is not ready */
+       TELEPHONY_STATE_READY, /**< Telephony state is ready */
 } telephony_state_e;
 
 /**

diff --git a/include/telephony_network.h b/include/telephony_network.h
index 577c3303cf8d995c4646b950b5b2561ab6d0ca13..24b892fdd3d6b41133932df79f241431198bf463 100644 (file)
--- a/include/telephony_network.h
+++ b/include/telephony_network.h
@@ -138,9 +138,10 @@ typedef enum {
  *
  * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif
  * @privlevel public
- * @privilege %http://tizen.org/privilege/telephony
+ * @privilege %http://tizen.org/privilege/location.coarse
  *
- * @remarks This API can be used in GSM / WCDMA network.
+ * @remarks This API can be used in GSM / WCDMA network. @n
+ *     http://tizen.org/privilege/location.coarse privilege is required to use this API since 3.0.
  *
  * @param[in] handle The handle from telephony_init()
  * @param[out] lac The Location Area Code, -1 if unknown
@@ -164,9 +165,10 @@ int telephony_network_get_lac(telephony_h handle, int *lac);
  *
  * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif
  * @privlevel public
- * @privilege %http://tizen.org/privilege/telephony
+ * @privilege %http://tizen.org/privilege/location.coarse
  *
- * @remarks This API can be used in GSM / WCDMA / LTE network.
+ * @remarks This API can be used in GSM / WCDMA / LTE network. @n
+ *     http://tizen.org/privilege/location.coarse privilege is required to use this API since 3.0.
  *
  * @param[in] handle The handle from telephony_init()
  * @param[out] cell_id The cell identification number, -1 if unknown
@@ -474,7 +476,7 @@ int telephony_network_get_selection_mode(telephony_h handle,
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/telephony
+ * @privilege %http://tizen.org/privilege/location.coarse
  *
  * @remarks This API can be used in LTE network.
  *
@@ -500,7 +502,7 @@ int telephony_network_get_tac(telephony_h handle, int *tac);
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/telephony
+ * @privilege %http://tizen.org/privilege/location.coarse
  *
  * @remarks This API can be used in CDMA network.
  *
@@ -526,7 +528,7 @@ int telephony_network_get_system_id(telephony_h handle, int *sid);
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/telephony
+ * @privilege %http://tizen.org/privilege/location.coarse
  *
  * @remarks This API can be used in CDMA network.
  *
@@ -552,7 +554,7 @@ int telephony_network_get_network_id(telephony_h handle, int *nid);
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/telephony
+ * @privilege %http://tizen.org/privilege/location.coarse
  *
  * @remarks This API can be used in CDMA network.
  *
@@ -578,7 +580,7 @@ int telephony_network_get_base_station_id(telephony_h handle, int *bs_id);
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/telephony
+ * @privilege %http://tizen.org/privilege/location.coarse
  *
  * @remarks This API can be used in CDMA network.
  *
@@ -604,7 +606,7 @@ int telephony_network_get_base_station_latitude(telephony_h handle, int *bs_lati
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/telephony
+ * @privilege %http://tizen.org/privilege/location.coarse
  *
  * @remarks This API can be used in CDMA network.
  *

diff --git a/packaging/capi-telephony.spec b/packaging/capi-telephony.spec
index 2a864dc9650bc4046503379bc9606e0a9fe3812e..44300419526f75f65c35d23b1f56eb1968f11ab1 100644 (file)
--- a/packaging/capi-telephony.spec
+++ b/packaging/capi-telephony.spec
@@ -1,6 +1,6 @@
 Name:       capi-telephony
 Summary:    Telephony Core API
-Version:    0.1.58
+Version:    0.1.59
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0

diff --git a/src/telephony_common.c b/src/telephony_common.c
index 30a3cea2bd23d12a6b817bf753ab7fb83edfec6d..ccb57ab13815edca9890942cf520696fb2a95ef8 100644 (file)
--- a/src/telephony_common.c
+++ b/src/telephony_common.c
@@ -82,7 +82,7 @@ static const char *_mapping_noti_id(telephony_noti_e noti_id)
        case TELEPHONY_NOTI_NETWORK_SERVICE_STATE:
                return TAPI_PROP_NETWORK_SERVICE_TYPE;
        case TELEPHONY_NOTI_NETWORK_CELLID:
-               return TAPI_PROP_NETWORK_CELLID;
+               return TAPI_NOTI_NETWORK_CELLID;
        case TELEPHONY_NOTI_NETWORK_ROAMING_STATUS:
                return TAPI_PROP_NETWORK_ROAMING_STATUS;
        case TELEPHONY_NOTI_NETWORK_SIGNALSTRENGTH_LEVEL:
@@ -97,6 +97,20 @@ static const char *_mapping_noti_id(telephony_noti_e noti_id)
                return TAPI_NOTI_NETWORK_DEFAULT_DATA_SUBSCRIPTION;
        case TELEPHONY_NOTI_NETWORK_DEFAULT_SUBSCRIPTION:
                return TAPI_NOTI_NETWORK_DEFAULT_SUBSCRIPTION;
+       case TELEPHONY_NOTI_NETWORK_LAC:
+               return TAPI_NOTI_NETWORK_LAC;
+       case TELEPHONY_NOTI_NETWORK_TAC:
+               return TAPI_NOTI_NETWORK_TAC;
+       case TELEPHONY_NOTI_NETWORK_SYSTEM_ID:
+               return TAPI_NOTI_NETWORK_SYSTEM_ID;
+       case TELEPHONY_NOTI_NETWORK_NETWORK_ID:
+               return TAPI_NOTI_NETWORK_NETWORK_ID;
+       case TELEPHONY_NOTI_NETWORK_BS_ID:
+               return TAPI_NOTI_NETWORK_BS_ID;
+       case TELEPHONY_NOTI_NETWORK_BS_LATITUDE:
+               return TAPI_NOTI_NETWORK_BS_LATITUDE;
+       case TELEPHONY_NOTI_NETWORK_BS_LONGITUDE:
+               return TAPI_NOTI_NETWORK_BS_LONGITUDE;
        case TELEPHONY_NOTI_VOICE_CALL_STATUS_IDLE:
                return TAPI_NOTI_VOICE_CALL_STATUS_IDLE;
        case TELEPHONY_NOTI_VOICE_CALL_STATUS_ACTIVE:

diff --git a/test/test_all_api.c b/test/test_all_api.c
index 2b6c2ae45b80a5cfeb309d900072f5964b1c5706..94f4d6bf5e1d069ec0d35a1ffff011fdf64fa866 100644 (file)
--- a/test/test_all_api.c
+++ b/test/test_all_api.c
@@ -42,7 +42,14 @@ static int network_noti_tbl[] = {
        TELEPHONY_NOTI_NETWORK_NETWORK_NAME,
        TELEPHONY_NOTI_NETWORK_PS_TYPE,
        TELEPHONY_NOTI_NETWORK_DEFAULT_DATA_SUBSCRIPTION,
-       TELEPHONY_NOTI_NETWORK_DEFAULT_SUBSCRIPTION
+       TELEPHONY_NOTI_NETWORK_DEFAULT_SUBSCRIPTION,
+       TELEPHONY_NOTI_NETWORK_LAC,
+       TELEPHONY_NOTI_NETWORK_TAC,
+       TELEPHONY_NOTI_NETWORK_SYSTEM_ID,
+       TELEPHONY_NOTI_NETWORK_NETWORK_ID,
+       TELEPHONY_NOTI_NETWORK_BS_ID,
+       TELEPHONY_NOTI_NETWORK_BS_LATITUDE,
+       TELEPHONY_NOTI_NETWORK_BS_LONGITUDE
 };
 
 static int call_noti_tbl[] = {
@@ -202,6 +209,27 @@ static void network_noti_cb(telephony_h handle, telephony_noti_e noti_id, void *
        case TELEPHONY_NOTI_NETWORK_DEFAULT_SUBSCRIPTION:
                LOGI("Noti!!! Default Subscription: [%d]", *(int *)data);
                break;
+       case TELEPHONY_NOTI_NETWORK_LAC:
+               LOGI("Noti!!! LAC: [%d]", *(int *)data);
+               break;
+       case TELEPHONY_NOTI_NETWORK_TAC:
+               LOGI("Noti!!! TAC: [%d]", *(int *)data);
+               break;
+       case TELEPHONY_NOTI_NETWORK_SYSTEM_ID:
+               LOGI("Noti!!! System ID: [%d]", *(int *)data);
+               break;
+       case TELEPHONY_NOTI_NETWORK_NETWORK_ID:
+               LOGI("Noti!!! Network ID: [%d]", *(int *)data);
+               break;
+       case TELEPHONY_NOTI_NETWORK_BS_ID:
+               LOGI("Noti!!! Base Station ID: [%d]", *(int *)data);
+               break;
+       case TELEPHONY_NOTI_NETWORK_BS_LATITUDE:
+               LOGI("Noti!!! Base Station Latitude: [%d]", *(int *)data);
+               break;
+       case TELEPHONY_NOTI_NETWORK_BS_LONGITUDE:
+               LOGI("Noti!!! Base Station Longitude: [%d]", *(int *)data);
+               break;
        default:
                LOGE("Unknown noti");
                break;