Sync with the latest wearable changes

[model] Redwood,Kiran,B3(Wearable)
[binary_type] AP
[customer] Docomo/Orange/ATT/Open
[issue#] N/A
[problem]
[cause]
[solution]
[team] HomeTF
[request]
[horizontal_expansion]

Change-Id: I763eaf1d0afae494a7750e186cbce517d226539d

diff --git a/com.samsung.data-provider-slave.xml b/com.samsung.data-provider-slave.xml
index 8e43bf5..d34fe2a 100644 (file)
--- a/com.samsung.data-provider-slave.xml
+++ b/com.samsung.data-provider-slave.xml
@@ -7,7 +7,7 @@
 
        <ui-application appid="com.samsung.data-provider-slave" exec="/usr/apps/com.samsung.data-provider-slave/bin/data-provider-slave" nodisplay="true" multiple="true" type="capp" taskmanage="false">
                <icon>com.samsung.data-provider-slave.png</icon>
-               <label>Dynamic Box Provider (slave)</label>
+               <label>Dynamic Box Provider (Default)</label>
                <label xml:lang="en-us">Dynamic Box Provider (slave)</label>
        </ui-application>
        <privileges>
@@ -19,4 +19,7 @@
                <label>Icon Provider (Default)</label>
                <label xml:lang="en-us">Icon Provider (Default)</label>
        </ui-application>
+       <privileges>
+               <privilege>http://tizen.org/privilege/contact.read</privilege>
+       </privileges>
 </manifest>

diff --git a/packaging/com.samsung.data-provider-slave.manifest b/packaging/com.samsung.data-provider-slave.manifest
index 5942d0a..75841b6 100644 (file)
--- a/packaging/com.samsung.data-provider-slave.manifest
+++ b/packaging/com.samsung.data-provider-slave.manifest
@@ -1,12 +1,18 @@
 <manifest>
        <!-- Provider slave label -->
        <define>
-               <domain name="com.samsung.data-provider-slave" policy="restricted" />
+               <domain name="com.samsung.data-provider-slave" policy="shared" />
+               <request>
+                       <smack request="contacts-service" type="rwx" />
+                       <smack request="contacts-service::vconf" type="rwxl" />
+                       <smack request="contacts-service::db" type="rw" />
+                       <smack request="contacts-service::svc" type="rlw" />
+                       <smack request="contacts-service::vconf-private" type="rl" />
+                       <smack request="key-storage::db" type="rl" />
+                       <smack request="media-data::db" type="rw" />
+               </request>
        </define>
-       <request>
-               <domain name="com.samsung.data-provider-slave" />
-       </request>
-
+       
        <assign>
                <!-- Application folder -->
                <filesystem path="/usr/apps/com.samsung.data-provider-slave" label="com.samsung.data-provider-slave" />

diff --git a/src/client.c b/src/client.c
index 5ebcc07..60728d0 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -76,7 +76,7 @@ static int method_new(struct event_arg *arg, int *width, int *height, double *pr
        _arg.category = arg->info.lb_create.category;
        _arg.abi = arg->info.lb_create.abi;
        _arg.skip_need_to_create = arg->info.lb_create.skip_need_to_create;
-       _arg.direct_addr = NULL; // arg->info.lb_create.direct_addr;
+       _arg.direct_addr = arg->info.lb_create.direct_addr;
 
        ret = lb_create(arg->pkgname, arg->id,
                        &_arg,
@@ -148,7 +148,7 @@ static int method_renew(struct event_arg *arg, void *data)
        _arg.category = arg->info.lb_recreate.category;
        _arg.abi = arg->info.lb_recreate.abi;
        _arg.skip_need_to_create = 1;
-       _arg.direct_addr = NULL; // arg->info.lb_recreate.direct_addr;
+       _arg.direct_addr = arg->info.lb_recreate.direct_addr;
 
        ret = lb_create(arg->pkgname, arg->id,
                        &_arg,

diff --git a/src/connection.c b/src/connection.c
index 51a1ead..b6f2aa6 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -61,7 +61,7 @@ static int connected_cb(int handle, void *data)
        struct event_item *item;
 
        EINA_LIST_FOREACH_SAFE(s_info.connected_list, l, n, item) {
-               s_info.process = DISCONNECTION;
+               s_info.process = CONNECTION;
                if (item->deleted || item->event_cb(handle, item->data) < 0 || item->deleted) {
                        s_info.connected_list = eina_list_remove(s_info.connected_list, item);
                        free(item);

diff --git a/src/lb.c b/src/lb.c
index 386ddc1..341cf8a 100644 (file)
--- a/src/lb.c
+++ b/src/lb.c
@@ -1282,9 +1282,7 @@ int livebox_send_updated(const char *pkgname, const char *id, int w, int h)
                }
 
                if (item->direct_path) {
-                       // Not yet supported for kiran
-                       // ret = provider_send_direct_updated(connection_handle(item->direct_path), pkgname, id, w, h);
-                       ret = provider_send_updated(pkgname, id, w, h);
+                       ret = provider_send_direct_updated(connection_handle(item->direct_path), pkgname, id, w, h);
                } else {
                        ret = provider_send_updated(pkgname, id, w, h);
                }
@@ -1307,9 +1305,7 @@ int livebox_send_desc_updated(const char *pkgname, const char *id, const char *d
                }
 
                if (item->direct_path) {
-                       // Not yet supported for kiran
-                       //ret = provider_send_direct_desc_updated(connection_handle(item->direct_path), pkgname, id, descfile);
-                       ret = provider_send_desc_updated(pkgname, id, descfile);
+                       ret = provider_send_direct_desc_updated(connection_handle(item->direct_path), pkgname, id, descfile);
                } else {
                        ret = provider_send_desc_updated(pkgname, id, descfile);
                }