release tizen_2.0 beta

diff --git a/debian/changelog b/debian/changelog
index 76f1b4e..2666819 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,47 @@
+tel-plugin-vconf (0.1.12) unstable; urgency=low
+
+  * fix HSDPA indicator bug
+  * Git: slp/pkgs/t/tel-plugin-vconf
+  * Tag: tel-plugin-vconf_0.1.12
+
+ -- DongHoo Park <donghoo.park@samsung.com>  Wed, 20 Jun 2012 14:37:23 +0900
+
+tel-plugin-vconf (0.1.11) unstable; urgency=low
+
+  * update vconf key in postinst and spec file
+  * Git: slp/pkgs/t/tel-plugin-vconf
+  * Tag: tel-plugin-vconf_0.1.11
+
+ -- Kyeongchul Kim <kyeongchul.kim@samsung.com>  Mon, 04 Jun 2012 12:07:44 +0900
+
+tel-plugin-vconf (0.1.10) unstable; urgency=low
+
+  * Rename Private VCONF KEY(imsi)
+  * Git: slp/pkgs/t/tel-plugin-vconf
+  * Tag: tel-plugin-vconf_0.1.10
+
+ -- Kyeongchul Kim <kyeongchul.kim@samsung.com>  Wed, 16 May 2012 15:29:39 +0900
+
+tel-plugin-vconf (0.1.9) unstable; urgency=low
+
+  * Remove Private VCONF KEY
+  * Git: slp/pkgs/t/tel-plugin-vconf
+  * Tag: tel-plugin-vconf_0.1.9
+
+ -- Youngman Park <youngman.park@samsung.com>  Mon, 14 May 2012 20:20:25 +0900
+
+tel-plugin-vconf (0.1.8) unstable; urgency=low
+
+  * Add HSUPA, HSPA
+  * Git: slp/pkgs/t/tel-plugin-vconf
+  * Tag: tel-plugin-vconf_0.1.8
+
+ -- Inho Oh <inho48.oh@samsung.com>  Thu, 10 May 2012 11:25:25 +0900
+
 tel-plugin-vconf (0.1.7) unstable; urgency=low
 
   * Fix tapi_state vconf key
-  * Git: pkgs/t/tel-plugin-vconf
+  * Git: slp/pkgs/t/tel-plugin-vconf
   * Tag: tel-plugin-vconf_0.1.7
 
  -- Inho Oh <inho48.oh@samsung.com>  Wed, 04 Apr 2012 15:41:40 +0900
@@ -9,7 +49,7 @@ tel-plugin-vconf (0.1.7) unstable; urgency=low
 tel-plugin-vconf (0.1.6) unstable; urgency=low
 
   * version up for code sync with public binary
-  * Git: pkgs/t/tel-plugin-vconf
+  * Git: slp/pkgs/t/tel-plugin-vconf
   * Tag: tel-plugin-vconf_0.1.6
 
  -- Kyeongchul Kim <kyeongchul.kim@samsung.com>  Mon, 02 Apr 2012 13:31:02 +0900
@@ -17,7 +57,7 @@ tel-plugin-vconf (0.1.6) unstable; urgency=low
 tel-plugin-vconf (0.1.5) unstable; urgency=low
 
   * Fix defect(s1-1961)
-  * Git: pkgs/t/tel-plugin-vconf
+  * Git: slp/pkgs/t/tel-plugin-vconf
   * Tag: tel-plugin-vconf_0.1.5
 
  -- DongHoo Park <donghoo.park@samsung.com>  Thu, 29 Mar 2012 20:17:12 +0900
@@ -25,7 +65,7 @@ tel-plugin-vconf (0.1.5) unstable; urgency=low
 tel-plugin-vconf (0.1.4) unstable; urgency=low
 
   * Fix prefix (TAPI_ to TCORE_)
-  * Git: pkgs/t/tel-plugin-vconf
+  * Git: slp/pkgs/t/tel-plugin-vconf
   * Tag: tel-plugin-vconf_0.1.4
 
  -- Inho Oh <inho48.oh@samsung.com>  Tue, 27 Mar 2012 22:24:15 +0900
@@ -33,7 +73,7 @@ tel-plugin-vconf (0.1.4) unstable; urgency=low
 tel-plugin-vconf (0.1.3) unstable; urgency=low
 
   * Add spn display condition vconf
-  * Git: pkgs/t/tel-plugin-vconf
+  * Git: slp/pkgs/t/tel-plugin-vconf
   * Tag: tel-plugin-vconf_0.1.3
 
  -- Inho Oh <inho48.oh@samsung.com>  Tue, 20 Mar 2012 17:11:25 +0900
@@ -41,15 +81,15 @@ tel-plugin-vconf (0.1.3) unstable; urgency=low
 tel-plugin-vconf (0.1.2) unstable; urgency=low
 
   * Add to update the vconfkey of svc type when the HDSPA Noti is comming
-  * Git: pkgs/t/tel-plugin-vconf
+  * Git: slp/pkgs/t/tel-plugin-vconf
   * Tag: tel-plugin-vconf_0.1.2
 
- -- Kyeongchul Kim <kyeongchul.kim@samsung.com>  Tue, 20 Mar 2012 16:02:57 +0900
+ -- DongHoo Park <donghoo.park@samsung.com>  Mon, 19 Mar 2012 15:33:40 +0900
 
 tel-plugin-vconf (0.1.1) unstable; urgency=low
 
   * Fix build break in OBS
-  * Git: pkgs/t/tel-plugin-vconf
+  * Git: slp/pkgs/t/tel-plugin-vconf
   * Tag: tel-plugin-vconf_0.1.1
 
  -- DongHoo Park <donghoo.park@samsung.com>  Fri, 16 Mar 2012 21:07:12 +0900
@@ -57,7 +97,7 @@ tel-plugin-vconf (0.1.1) unstable; urgency=low
 tel-plugin-vconf (0.1.0) unstable; urgency=low
 
   * Initial
-  * Git: pkgs/t/tel-plugin-vconf
+  * Git: slp/pkgs/t/tel-plugin-vconf
   * Tag: tel-plugin-vconf_0.1.0
 
  -- Inho Oh <inho48.oh@samsung.com>  Thu, 15 Mar 2012 22:37:29 +0900

diff --git a/debian/tel-plugin-vconf.postinst b/debian/tel-plugin-vconf.postinst
index 6807bea..3db7bad 100644 (file)
--- a/debian/tel-plugin-vconf.postinst
+++ b/debian/tel-plugin-vconf.postinst
@@ -1,15 +1,16 @@
 #!/bin/sh
 
 #Default Call Statistics
-vconftool set -t int db/dnet/statistics/cellular/totalsnt "0"
-vconftool set -t int db/dnet/statistics/cellular/totalrcv "0" 
-vconftool set -t int db/dnet/statistics/cellular/lastsnt "0"
-vconftool set -t int db/dnet/statistics/cellular/lastrcv "0"
+vconftool set -t int db/dnet/statistics/cellular/totalsnt 0 -i -f
+vconftool set -t int db/dnet/statistics/cellular/totalrcv 0 -i -f
+vconftool set -t int db/dnet/statistics/cellular/lastsnt 0 -i -f
+vconftool set -t int db/dnet/statistics/cellular/lastrcv 0 -i -f
 
 ##setting vconf key##
 vconftool set -t int memory/dnet/state 0 -i
 vconftool set -t int memory/dnet/cellular 4 -i
 vconftool set -t int memory/telephony/svc_type 0 -i -f
+vconftool set -t int memory/telephony/ps_type 0 -i -f
 vconftool set -t int memory/telephony/rssi 0 -i -f
 vconftool set -t int memory/telephony/sim_slot 0 -i -f
 vconftool set -t int memory/telephony/svc_roam 0 -i -f
@@ -31,7 +32,6 @@ vconftool set -t int memory/telephony/sat_idle 0 -i -f
 vconftool set -t int memory/telephony/sat_state 0 -i -f
 vconftool set -t int memory/telephony/zuhause_zone 0 -i -f
 vconftool set -t int memory/telephony/low_battery 0 -i -f
-vconftool set -t int memory/telephony/bIMSIFactoryProcess 0 -i -f
 vconftool set -t string memory/telephony/idle_text "" -i -f
 vconftool set -t string memory/telephony/spn "" -i -f
 vconftool set -t string memory/telephony/nw_name "" -i -f
@@ -41,5 +41,6 @@ vconftool set -t string memory/telephony/szSubscriberAlpha "" -i -f
 vconftool set -t string memory/telephony/szSWVersion "" -i -f
 vconftool set -t string memory/telephony/szHWVersion "" -i -f
 vconftool set -t string memory/telephony/szCalDate "" -i -f
-vconftool set -t string db/telephony/imsi "" -f
-vconftool set -t int db/telephony/emergency 0 -i -f
\ No newline at end of file
+vconftool set -t string memory/telephony/productCode "" -i -f
+vconftool set -t string db/private/tel-plugin-vconf/imsi "" -f
+vconftool set -t int db/telephony/emergency 0 -i -f

diff --git a/packaging/tel-plugin-vconf.spec b/packaging/tel-plugin-vconf.spec
index a0c65fd..f100236 100644 (file)
--- a/packaging/tel-plugin-vconf.spec
+++ b/packaging/tel-plugin-vconf.spec
@@ -1,7 +1,7 @@
 #sbs-git:slp/pkgs/t/tel-plugin-vconf
 Name:       tel-plugin-vconf
 Summary:    Telephony Vconf storage plugin
-Version: 0.1.7
+Version: 0.1.13
 Release:    1
 Group:      System/Libraries
 License:    Apache
@@ -29,15 +29,16 @@ make %{?jobs:-j%jobs}
 /sbin/ldconfig
 
 #Default Call Statistics
-vconftool set -t int db/dnet/statistics/cellular/totalsnt "0"
-vconftool set -t int db/dnet/statistics/cellular/totalrcv "0"
-vconftool set -t int db/dnet/statistics/cellular/lastsnt "0"
-vconftool set -t int db/dnet/statistics/cellular/lastrcv "0"
+vconftool set -t int db/dnet/statistics/cellular/totalsnt 0 -i -f
+vconftool set -t int db/dnet/statistics/cellular/totalrcv 0 -i -f
+vconftool set -t int db/dnet/statistics/cellular/lastsnt 0 -i -f
+vconftool set -t int db/dnet/statistics/cellular/lastrcv 0 -i -f
 
 ##setting vconf key##
 vconftool set -t int memory/dnet/state 0 -i
 vconftool set -t int memory/dnet/cellular 4 -i
 vconftool set -t int memory/telephony/svc_type 0 -i -f
+vconftool set -t int memory/telephony/ps_type 0 -i -f
 vconftool set -t int memory/telephony/rssi 0 -i -f
 vconftool set -t int memory/telephony/sim_slot 0 -i -f
 vconftool set -t int memory/telephony/svc_roam 0 -i -f
@@ -59,7 +60,6 @@ vconftool set -t int memory/telephony/sat_idle 0 -i -f
 vconftool set -t int memory/telephony/sat_state 0 -i -f
 vconftool set -t int memory/telephony/zuhause_zone 0 -i -f
 vconftool set -t int memory/telephony/low_battery 0 -i -f
-vconftool set -t int memory/telephony/bIMSIFactoryProcess 0 -i -f
 vconftool set -t string memory/telephony/idle_text "" -i -f
 vconftool set -t string memory/telephony/spn "" -i -f
 vconftool set -t string memory/telephony/nw_name "" -i -f
@@ -69,7 +69,8 @@ vconftool set -t string memory/telephony/szSubscriberAlpha "" -i -f
 vconftool set -t string memory/telephony/szSWVersion "" -i -f
 vconftool set -t string memory/telephony/szHWVersion "" -i -f
 vconftool set -t string memory/telephony/szCalDate "" -i -f
-vconftool set -t string db/telephony/imsi "" -f
+vconftool set -t string memory/telephony/productCode "" -i -f
+vconftool set -t string db/private/tel-plugin-vconf/imsi "" -f
 vconftool set -t int db/telephony/emergency 0 -i -f
 
 %postun -p /sbin/ldconfig

diff --git a/src/desc-vconf.c b/src/desc-vconf.c
index 24e216c..57602fe 100644 (file)
--- a/src/desc-vconf.c
+++ b/src/desc-vconf.c
@@ -34,6 +34,8 @@
 #include <storage.h>
 #include <co_network.h>
 
+static void reset_vconf();
+
 static TcoreStorageDispatchCallback callback_dispatch;
 
 static const gchar* convert_strgkey_to_vconf(enum tcore_storage_key key)
@@ -122,7 +124,7 @@ static const gchar* convert_strgkey_to_vconf(enum tcore_storage_key key)
                case STORAGE_KEY_TELEPHONY_FACTORY_KSTRINGB:
                        return VCONFKEY_TELEPHONY_FACTORY_KSTRINGB;
                case STORAGE_KEY_TELEPHONY_IMSI:
-                       return "db/telephony/imsi";
+                       return "db/private/tel-plugin-vconf/imsi";
                case STORAGE_KEY_CELLULAR_STATE:
                        return VCONFKEY_NETWORK_CELLULAR_STATE;
                case STORAGE_KEY_CELLULAR_PKT_TOTAL_RCV:
@@ -265,7 +267,7 @@ static enum tcore_storage_key convert_vconf_to_strgkey(const gchar* key)
        else if (g_str_equal(key, VCONFKEY_TELEPHONY_FACTORY_KSTRINGB) == TRUE) {
                return STORAGE_KEY_TELEPHONY_FACTORY_KSTRINGB;
        }
-       else if (g_str_equal(key, "db/telephony/imsi") == TRUE) {
+       else if (g_str_equal(key, "db/private/tel-plugin-vconf/imsi") == TRUE) {
                return STORAGE_KEY_TELEPHONY_IMSI;
        }
        else if (g_str_equal(key, VCONFKEY_NETWORK_CELLULAR_STATE) == TRUE) {
@@ -714,32 +716,39 @@ static enum tcore_hook_return on_hook_pb_init(Server *s, CoreObject *source, enu
        return TCORE_HOOK_RETURN_CONTINUE;
 }
 
-static enum tcore_hook_return on_hook_ps_protocol_status(Server *s, CoreObject *source, enum tcore_notification_command command, unsigned int data_len, void *data, void *user_data)
+static enum tcore_hook_return on_hook_ps_protocol_status(Server *s, CoreObject *source,
+               enum tcore_notification_command command, unsigned int data_len, void *data, void *user_data)
 {
-       TcorePlugin *p = NULL;
+/*     TcorePlugin *p = NULL;
        GSList *co_list = NULL;
-       CoreObject *co_network = NULL;
-       const struct tnoti_ps_protocol_status *noti = data;
+       CoreObject *co_network = NULL;*/
        enum telephony_network_service_type svc_type;
+       const struct tnoti_ps_protocol_status *noti = data;
+
        dbg("vconf set")
 
        vconf_get_int(VCONFKEY_TELEPHONY_SVCTYPE, (int *)&svc_type);
-       if((int)svc_type < (int)VCONFKEY_TELEPHONY_SVCTYPE_2G){
+       if(svc_type < (enum telephony_network_service_type)VCONFKEY_TELEPHONY_SVCTYPE_2G){
                dbg("service state is not available");
                return TCORE_HOOK_RETURN_CONTINUE;
        }
 
-       if(noti->status == TELEPHONY_HSDPA_ON)
-               vconf_set_int(VCONFKEY_TELEPHONY_SVCTYPE, VCONFKEY_TELEPHONY_SVCTYPE_HSDPA);
-       else{
-               p = tcore_object_ref_plugin(source);
-               co_list = tcore_plugin_get_core_objects_bytype(p, CORE_OBJECT_TYPE_NETWORK);
-               co_network = co_list->data;
-               if(!co_network)
-                       dbg("network co does not exist");
-               tcore_network_get_service_type(co_network, &svc_type);
-               vconf_set_int(VCONFKEY_TELEPHONY_SVCTYPE, svc_type);
-               g_slist_free(co_list);
+       switch (noti->status) {
+               case TELEPHONY_HSDPA_OFF:
+                       vconf_set_int(VCONFKEY_TELEPHONY_PSTYPE, VCONFKEY_TELEPHONY_PSTYPE_NONE);
+                       break;
+
+               case TELEPHONY_HSDPA_ON:
+                       vconf_set_int(VCONFKEY_TELEPHONY_PSTYPE, VCONFKEY_TELEPHONY_PSTYPE_HSDPA);
+                       break;
+
+               case TELEPHONY_HSUPA_ON:
+                       vconf_set_int(VCONFKEY_TELEPHONY_PSTYPE, VCONFKEY_TELEPHONY_PSTYPE_HSUPA);
+                       break;
+
+               case TELEPHONY_HSPA_ON:
+                       vconf_set_int(VCONFKEY_TELEPHONY_PSTYPE, VCONFKEY_TELEPHONY_PSTYPE_HSPA);
+                       break;
        }
 
        return TCORE_HOOK_RETURN_CONTINUE;
@@ -753,8 +762,12 @@ static enum tcore_hook_return on_hook_modem_power(Server *s, CoreObject *source,
        if (power->state == MODEM_STATE_ONLINE) {
                dbg("tapi ready");
                vconf_set_int(VCONFKEY_TELEPHONY_TAPI_STATE, VCONFKEY_TELEPHONY_TAPI_STATE_READY);
-       }
-       else {
+       } else if (power->state == MODEM_STATE_ERROR) {
+
+               dbg("cp crash : all network setting will be reset");
+               reset_vconf();
+
+       } else {
                dbg("tapi none");
                vconf_set_int(VCONFKEY_TELEPHONY_TAPI_STATE, VCONFKEY_TELEPHONY_TAPI_STATE_NONE);
        }