Added 3.0 methods for location cell info

Change-Id: I1ad5b10f75b4472d2e98c4ae7cb356b893d46124

diff --git a/introspection/network.xml b/introspection/network.xml
index 2704e06..b6e581b 100644 (file)
--- a/introspection/network.xml
+++ b/introspection/network.xml
@@ -281,6 +281,79 @@
 
                        Network registration status.
                -->
+
+               <!--
+                       GetCellId:
+                       @cell_id: Cell ID (GSM / WCDMA / LTE)
+                       @since_tizen 3.0
+               -->
+               <method name="GetCellId">
+                       <arg direction="out" type="i" name="cell_id"/>
+               </method>
+
+               <!--
+                       GetLac:
+                       @lac: Location Area Code (GSM / WCDMA)
+                       @since_tizen 3.0
+               -->
+               <method name="GetLac">
+                       <arg direction="out" type="i" name="lac"/>
+               </method>
+
+               <!--
+                       GetTac:
+                       @tac: Track Area Code (LTE)
+                       @since_tizen 3.0
+               -->
+               <method name="GetTac">
+                       <arg direction="out" type="i" name="tac"/>
+               </method>
+
+               <!--
+                       GetSystemId:
+                       @system_id: System ID (CDMA)
+                       @since_tizen 3.0
+               -->
+               <method name="GetSystemId">
+                       <arg direction="out" type="i" name="system_id"/>
+               </method>
+
+               <!--
+                       GetNetworkId:
+                       @network_id: Network ID (CDMA)
+                       @since_tizen 3.0
+               -->
+               <method name="GetNetworkId">
+                       <arg direction="out" type="i" name="network_id"/>
+               </method>
+
+               <!--
+                       GetBsId:
+                       @bs_id: Base station ID (CDMA)
+                       @since_tizen 3.0
+               -->
+               <method name="GetBsId">
+                       <arg direction="out" type="i" name="bs_id"/>
+               </method>
+
+               <!--
+                       GetBsLatitude:
+                       @bs_latitude: Base station latitude (CDMA)
+                       @since_tizen 3.0
+               -->
+               <method name="GetBsLatitude">
+                       <arg direction="out" type="i" name="bs_latitude"/>
+               </method>
+
+               <!--
+                       GetBsLongitude:
+                       @bs_longitude: Base station longitude (CDMA)
+                       @since_tizen 3.0
+               -->
+               <method name="GetBsLongitude">
+                       <arg direction="out" type="i" name="bs_longitude"/>
+               </method>
+
                <signal name="RegistrationStatus">
                        <arg type="i" name="circuit"/>
                        <arg type="i" name="packet"/>
@@ -420,6 +493,78 @@
                        <arg type="s" name="network_name"/>
                </signal>
 
+               <!--
+                       CellId:
+                       @cell_id: Cell ID (GSM / WCDMA / LTE)
+                       @since_tizen 3.0
+               -->
+               <signal name="CellId">
+                       <arg type="i" name="cell_id"/>
+               </signal>
+
+               <!--
+                       Lac:
+                       @lac: Location Area Code (GSM / WCDMA)
+                       @since_tizen 3.0
+               -->
+               <signal name="Lac">
+                       <arg type="i" name="lac"/>
+               </signal>
+
+               <!--
+                       Tac:
+                       @tac: Track Area Code (LTE)
+                       @since_tizen 3.0
+               -->
+               <signal name="Tac">
+                       <arg type="i" name="tac"/>
+               </signal>
+
+               <!--
+                       SystemId:
+                       @system_id: System ID (CDMA)
+                       @since_tizen 3.0
+               -->
+               <signal name="SystemId">
+                       <arg type="i" name="system_id"/>
+               </signal>
+
+               <!--
+                       NetworkId:
+                       @network_id: Network ID (CDMA)
+                       @since_tizen 3.0
+               -->
+               <signal name="NetworkId">
+                       <arg type="i" name="network_id"/>
+               </signal>
+
+               <!--
+                       BsId:
+                       @bs_id: Base station ID (CDMA)
+                       @since_tizen 3.0
+               -->
+               <signal name="BsId">
+                       <arg type="i" name="bs_id"/>
+               </signal>
+
+               <!--
+                       BsLatitude:
+                       @bs_latitude: Base station latitude (CDMA)
+                       @since_tizen 3.0
+               -->
+               <signal name="BsLatitude">
+                       <arg type="i" name="bs_latitude"/>
+               </signal>
+
+               <!--
+                       BsLongitude:
+                       @bs_longitude: Base station longitude (CDMA)
+                       @since_tizen 3.0
+               -->
+               <signal name="BsLongitude">
+                       <arg type="i" name="bs_longitude"/>
+               </signal>
+
                <!-- sig_dbm : Signal Strength DBM -->
                <property name="sig_dbm" type="i" access="read"/>
 
@@ -511,6 +656,36 @@
                -->
                <property name="volte_enable" type="i" access="read"/>
 
+               <!--
+                       System ID (CDMA)
+                       @since_tizen 3.0
+               -->
+               <property name="system_id" type="i" access="read"/>
+
+               <!--
+                       Network ID (CDMA)
+                       @since_tizen 3.0
+               -->
+               <property name="network_id" type="i" access="read"/>
+
+               <!--
+                       Base station ID (CDMA)
+                       @since_tizen 3.0
+               -->
+               <property name="bs_id" type="i" access="read"/>
+
+               <!--
+                       Base station Latitude (CDMA)
+                       @since_tizen 3.0
+               -->
+               <property name="bs_latitude" type="i" access="read"/>
+
+               <!--
+                       Base station Longitude (CDMA)
+                       @since_tizen 3.0
+               -->
+               <property name="bs_longitude" type="i" access="read"/>
+
        </interface>
 
 </node>

diff --git a/packaging/tel-plugin-dbus_tapi.spec b/packaging/tel-plugin-dbus_tapi.spec
index beea97f..378f061 100644 (file)
--- a/packaging/tel-plugin-dbus_tapi.spec
+++ b/packaging/tel-plugin-dbus_tapi.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 3
-%define patchlevel 71
+%define patchlevel 72
 
 Name:           tel-plugin-dbus_tapi
 Version:        %{major}.%{minor}.%{patchlevel}

diff --git a/packaging/telephony.conf b/packaging/telephony.conf
index 94c0010..91a4fe6 100644 (file)
--- a/packaging/telephony.conf
+++ b/packaging/telephony.conf
@@ -94,7 +94,32 @@
                 <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="GetDefaultDataSubscription" privilege="http://tizen.org/privilege/telephony"/>
                 <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="SetDefaultSubscription" privilege="http://tizen.org/privilege/telephony.admin"/>
                 <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="GetDefaultSubscription" privilege="http://tizen.org/privilege/telephony"/>
-                <check receive_sender="org.tizen.telephony" receive_interface="org.tizen.telephony.Network" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="GetCellId" privilege="http://tizen.org/privilege/location.coarse"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="GetLac" privilege="http://tizen.org/privilege/location.coarse"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="GetTac" privilege="http://tizen.org/privilege/location.coarse"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="GetSystemId" privilege="http://tizen.org/privilege/location.coarse"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="GetNetworkId" privilege="http://tizen.org/privilege/location.coarse"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="GetBsId" privilege="http://tizen.org/privilege/location.coarse"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="GetBsLatitude" privilege="http://tizen.org/privilege/location.coarse"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="GetBsLongitude" privilege="http://tizen.org/privilege/location.coarse"/>
+                <check receive_sender="org.tizen.telephony" receive_interface="org.tizen.telephony.Network" receive_member="RegistrationStatus" privilege="http://tizen.org/privilege/telephony"/>
+                <check receive_sender="org.tizen.telephony" receive_interface="org.tizen.telephony.Network" receive_member="SignalStrength" privilege="http://tizen.org/privilege/telephony"/>
+                <check receive_sender="org.tizen.telephony" receive_interface="org.tizen.telephony.Network" receive_member="Change" privilege="http://tizen.org/privilege/telephony"/>
+                <check receive_sender="org.tizen.telephony" receive_interface="org.tizen.telephony.Network" receive_member="TimeInfo" privilege="http://tizen.org/privilege/telephony"/>
+                <check receive_sender="org.tizen.telephony" receive_interface="org.tizen.telephony.Network" receive_member="Identity" privilege="http://tizen.org/privilege/telephony"/>
+                <check receive_sender="org.tizen.telephony" receive_interface="org.tizen.telephony.Network" receive_member="CellInfo" privilege="http://tizen.org/privilege/telephony"/>
+                <check receive_sender="org.tizen.telephony" receive_interface="org.tizen.telephony.Network" receive_member="EmergencyCallbackMode" privilege="http://tizen.org/privilege/telephony"/>
+                <check receive_sender="org.tizen.telephony" receive_interface="org.tizen.telephony.Network" receive_member="DefaultDataSubscription" privilege="http://tizen.org/privilege/telephony"/>
+                <check receive_sender="org.tizen.telephony" receive_interface="org.tizen.telephony.Network" receive_member="DefaultSubscription" privilege="http://tizen.org/privilege/telephony"/>
+                <check receive_sender="org.tizen.telephony" receive_interface="org.tizen.telephony.Network" receive_member="PropertyInfo" privilege="http://tizen.org/privilege/telephony"/>
+                <check receive_sender="org.tizen.telephony" receive_interface="org.tizen.telephony.Network" receive_member="CellId" privilege="http://tizen.org/privilege/location.coarse"/>
+                <check receive_sender="org.tizen.telephony" receive_interface="org.tizen.telephony.Network" receive_member="Lac" privilege="http://tizen.org/privilege/location.coarse"/>
+                <check receive_sender="org.tizen.telephony" receive_interface="org.tizen.telephony.Network" receive_member="Tac" privilege="http://tizen.org/privilege/location.coarse"/>
+                <check receive_sender="org.tizen.telephony" receive_interface="org.tizen.telephony.Network" receive_member="SystemId" privilege="http://tizen.org/privilege/location.coarse"/>
+                <check receive_sender="org.tizen.telephony" receive_interface="org.tizen.telephony.Network" receive_member="NetworkId" privilege="http://tizen.org/privilege/location.coarse"/>
+                <check receive_sender="org.tizen.telephony" receive_interface="org.tizen.telephony.Network" receive_member="BsId" privilege="http://tizen.org/privilege/location.coarse"/>
+                <check receive_sender="org.tizen.telephony" receive_interface="org.tizen.telephony.Network" receive_member="BsLatitude" privilege="http://tizen.org/privilege/location.coarse"/>
+                <check receive_sender="org.tizen.telephony" receive_interface="org.tizen.telephony.Network" receive_member="BsLongitude" privilege="http://tizen.org/privilege/location.coarse"/>
 
                 <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.sms" send_member="SendMsg" privilege="http://tizen.org/privilege/telephony.admin"/>
                 <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.sms" send_member="ReadMsg" privilege="http://tizen.org/privilege/telephony"/>

diff --git a/src/dtapi_network.c b/src/dtapi_network.c
index 5a7f7d0..637a3b4 100644 (file)
--- a/src/dtapi_network.c
+++ b/src/dtapi_network.c
@@ -776,6 +776,86 @@ static gboolean on_network_get_roaming_preference(TelephonyNetwork *network,
        return TRUE;
 }
 
+static gboolean on_network_get_cell_id(TelephonyNetwork *network,
+       GDBusMethodInvocation *invocation, gpointer user_data)
+{
+       int cell_id;
+       /* Get property */
+       cell_id = telephony_network_get_cell_id(network);
+       telephony_network_complete_get_cell_id(network, invocation, cell_id);
+       return TRUE;
+}
+
+static gboolean on_network_get_lac(TelephonyNetwork *network,
+       GDBusMethodInvocation *invocation, gpointer user_data)
+{
+       int lac;
+       /* Get property */
+       lac = telephony_network_get_lac(network);
+       telephony_network_complete_get_lac(network, invocation, lac);
+       return TRUE;
+}
+
+static gboolean on_network_get_tac(TelephonyNetwork *network,
+       GDBusMethodInvocation *invocation, gpointer user_data)
+{
+       int tac;
+       /* Get property */
+       tac = telephony_network_get_tac(network);
+       telephony_network_complete_get_tac(network, invocation, tac);
+       return TRUE;
+}
+
+static gboolean on_network_get_system_id(TelephonyNetwork *network,
+       GDBusMethodInvocation *invocation, gpointer user_data)
+{
+       int sid;
+       /* Get property */
+       sid = telephony_network_get_system_id(network);
+       telephony_network_complete_get_system_id(network, invocation, sid);
+       return TRUE;
+}
+
+static gboolean on_network_get_network_id(TelephonyNetwork *network,
+       GDBusMethodInvocation *invocation, gpointer user_data)
+{
+       int nid;
+       /* Get property */
+       nid = telephony_network_get_network_id(network);
+       telephony_network_complete_get_network_id(network, invocation, nid);
+       return TRUE;
+}
+
+static gboolean on_network_get_bs_id(TelephonyNetwork *network,
+       GDBusMethodInvocation *invocation, gpointer user_data)
+{
+       int bs_id;
+       /* Get property */
+       bs_id = telephony_network_get_bs_id(network);
+       telephony_network_complete_get_bs_id(network, invocation, bs_id);
+       return TRUE;
+}
+
+static gboolean on_network_get_bs_latitude(TelephonyNetwork *network,
+       GDBusMethodInvocation *invocation, gpointer user_data)
+{
+       int bs_latitude;
+       /* Get property */
+       bs_latitude = telephony_network_get_bs_latitude(network);
+       telephony_network_complete_get_bs_latitude(network, invocation, bs_latitude);
+       return TRUE;
+}
+
+static gboolean on_network_get_bs_longitude(TelephonyNetwork *network,
+       GDBusMethodInvocation *invocation, gpointer user_data)
+{
+       int bs_longitude;
+       /* Get property */
+       bs_longitude = telephony_network_get_bs_longitude(network);
+       telephony_network_complete_get_bs_longitude(network, invocation, bs_longitude);
+       return TRUE;
+}
+
 gboolean dbus_plugin_setup_network_interface(TelephonyObjectSkeleton *object,
        struct custom_data *ctx)
 {
@@ -874,6 +954,38 @@ gboolean dbus_plugin_setup_network_interface(TelephonyObjectSkeleton *object,
                "handle-get-roaming-preference",
                G_CALLBACK(on_network_get_roaming_preference), ctx);
 
+       g_signal_connect(network,
+               "handle-get-cell-id",
+               G_CALLBACK(on_network_get_cell_id), ctx);
+
+       g_signal_connect(network,
+               "handle-get-lac",
+               G_CALLBACK(on_network_get_lac), ctx);
+
+       g_signal_connect(network,
+               "handle-get-tac",
+               G_CALLBACK(on_network_get_tac), ctx);
+
+       g_signal_connect(network,
+               "handle-get-system-id",
+               G_CALLBACK(on_network_get_system_id), ctx);
+
+       g_signal_connect(network,
+               "handle-get-network-id",
+               G_CALLBACK(on_network_get_network_id), ctx);
+
+       g_signal_connect(network,
+               "handle-get-bs-id",
+               G_CALLBACK(on_network_get_bs_id), ctx);
+
+       g_signal_connect(network,
+               "handle-get-bs-latitude",
+               G_CALLBACK(on_network_get_bs_latitude), ctx);
+
+       g_signal_connect(network,
+               "handle-get-bs-longitude",
+               G_CALLBACK(on_network_get_bs_longitude), ctx);
+
        /*
         * Initialize DBUS properties
         */
@@ -894,6 +1006,11 @@ gboolean dbus_plugin_setup_network_interface(TelephonyObjectSkeleton *object,
        telephony_network_set_plmn(network, NULL);
        telephony_network_set_spn_name(network, NULL);
        telephony_network_set_network_name(network, NULL);
+       telephony_network_set_system_id(network, -1);
+       telephony_network_set_network_id(network, -1);
+       telephony_network_set_bs_id(network, -1);
+       telephony_network_set_bs_latitude(network, 0x7FFFFFFF);
+       telephony_network_set_bs_longitude(network, 0x7FFFFFFF);
 
        tcore_server_remove_notification_hook(ctx->server, on_hook_ps_protocol_status);
        tcore_server_add_notification_hook(ctx->server,
@@ -1494,9 +1611,13 @@ gboolean dbus_plugin_network_notification(struct custom_data *ctx,
                if (NETWORK_SERVICE_TYPE_LTE == network_service_type) {
                        telephony_network_set_lac(network, -1);
                        telephony_network_set_tac(network, location->lac);
+                       telephony_network_emit_lac(network, -1);
+                       telephony_network_emit_tac(network, location->lac);
                } else {
                        telephony_network_set_lac(network, location->lac);
                        telephony_network_set_tac(network, -1);
+                       telephony_network_emit_lac(network, location->lac);
+                       telephony_network_emit_tac(network, -1);
                }
 
                telephony_network_set_cell_id(network, location->cell_id);
@@ -1504,6 +1625,32 @@ gboolean dbus_plugin_network_notification(struct custom_data *ctx,
                /* Emit signal */
                telephony_network_emit_cell_info(network,
                        location->lac, location->cell_id);
+               telephony_network_emit_cell_id(network,
+                       location->cell_id);
+       }
+       break;
+
+       case TNOTI_NETWORK_LOCATION_CELLINFO_CDMA: {
+               const struct tnoti_network_location_cellinfo_cdma *location = data;
+
+               info("[%s] NET_LOCATION_CELLINFO_CDMA - System ID: [0x%x] Network ID: [0x%x] "
+                       "Bs ID: [0x%x] Bs Latitude: [0x%x] Bs Longitude: [0x%x]",
+                       cp_name, location->system_id, location->network_id,
+                       location->bs_id, location->bs_latitude, location->bs_longitude);
+
+               /* Update properties */
+               telephony_network_set_system_id(network, location->system_id);
+               telephony_network_set_network_id(network, location->network_id);
+               telephony_network_set_bs_id(network, location->bs_id);
+               telephony_network_set_bs_latitude(network, location->bs_latitude);
+               telephony_network_set_bs_longitude(network, location->bs_longitude);
+
+               /* Emit signal */
+               telephony_network_emit_system_id(network, location->system_id);
+               telephony_network_emit_network_id(network, location->network_id);
+               telephony_network_emit_bs_id(network, location->bs_id);
+               telephony_network_emit_bs_latitude(network, location->bs_latitude);
+               telephony_network_emit_bs_longitude(network, location->bs_longitude);
        }
        break;