projects / test / tct / native / behavior.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c7f8489)
[TBT][Non-ACR][synced 3.0 code of tbt to 4.0 brnach] 77/126377/2
authornibha.sharma <nibha.sharma@samsung.com>
Fri, 21 Apr 2017 06:48:14 +0000 (12:18 +0530)
committerNibha Sharma <nibha.sharma@samsung.com>
Wed, 26 Apr 2017 03:34:44 +0000 (03:34 +0000)
Change-Id: If15dd1807b5189240e34e2f06efae6b7082e4a25
Signed-off-by: nibha.sharma <nibha.sharma@samsung.com>
release/binary-armv7l/install.sh patch | blob | history
release/binary-armv7l/org.example.multiclass-1.0.0-arm.tpk [new file with mode: 0755] patch | blob
release/binary-armv7l/org.tizen.tbt_pushtestapp-1.0.0-arm.tpk [changed mode: 0644->0755] patch | blob | history
release/binary-x86/org.example.multiclass-1.0.0-x86.tpk [new file with mode: 0755] patch | blob
release/binary-x86/org.tizen.tbt_pushtestapp-1.0.0-x86.tpk [new file with mode: 0755] patch | blob
tbt_pushtestapp/res/tbt_push_auth.xml [new file with mode: 0755] patch | blob
tbt_pushtestapp/src/tbt_pushtestapp.c patch | blob | history
tbtcoreapp/src/model/tbt-list.c patch | blob | history
tbtcoreapp/tizen-manifest.xml patch | blob | history

diff --git a/release/binary-armv7l/install.sh b/release/binary-armv7l/install.sh
index 855b3de533d651d7f921ecf9708f025f631062a1..c2d2b55347c79852ba866ac3cac54b11ced7ad7b 100755 (executable)
--- a/release/binary-armv7l/install.sh
+++ b/release/binary-armv7l/install.sh
@@ -25,6 +25,8 @@
 
 EXECUTION_USER=owner
 
+sdb root on
+
 sdb push org.tizen.coretbt_dataprovider-1.0.0-arm.tpk /tmp
 sdb push org.tizen.coretbt_serviceapp-1.0.0-arm.tpk /tmp
 sdb push org.tizen.coretbt_uiapp-1.0.0-arm.tpk /tmp
@@ -35,6 +37,7 @@ sdb push org.tizen.tbtcoreapp-dali-1.0.0-arm.tpk /tmp
 sdb push org.tizen.tbtcoreapp-1.0.0-arm.tpk /tmp
 sdb push org.tizen.tbt_pushtestapp-1.0.0-arm.tpk /tmp
 sdb push org.tizen.tbt_ui_viewmgr-1.0.0-arm.tpk /tmp
+sdb push org.example.multiclass-1.0.0-arm.tpk /tmp
 
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.coretbt_dataprovider-1.0.0-arm.tpk" $EXECUTION_USER
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.coretbt_serviceapp-1.0.0-arm.tpk" $EXECUTION_USER
@@ -46,8 +49,7 @@ sdb shell pkgcmd -i -t tpk -p /tmp/org.tizen.tbt-ime-1.0.0-arm.tpk
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.tbtcoreapp-dali-1.0.0-arm.tpk" $EXECUTION_USER
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.tbt_pushtestapp-1.0.0-arm.tpk" $EXECUTION_USER
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.tbt_ui_viewmgr-1.0.0-arm.tpk" $EXECUTION_USER
-
-sdb root on
+sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.example.multiclass-1.0.0-arm.tpk" $EXECUTION_USER
 
 sdb push dog_1024_960.gif /home/$EXECUTION_USER/media/Images
 sdb push SampleMP3.mp3 /home/$EXECUTION_USER/media/Sounds
diff --git a/release/binary-armv7l/org.example.multiclass-1.0.0-arm.tpk b/release/binary-armv7l/org.example.multiclass-1.0.0-arm.tpk
new file mode 100755 (executable)
index 0000000..cfb6292
Binary files /dev/null and b/release/binary-armv7l/org.example.multiclass-1.0.0-arm.tpk differ
diff --git a/release/binary-armv7l/org.tizen.tbt_pushtestapp-1.0.0-arm.tpk b/release/binary-armv7l/org.tizen.tbt_pushtestapp-1.0.0-arm.tpk
old mode 100644 (file)
new mode 100755 (executable)
index cae201d..4d9f0f1
Binary files a/release/binary-armv7l/org.tizen.tbt_pushtestapp-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.tbt_pushtestapp-1.0.0-arm.tpk differ
diff --git a/release/binary-x86/org.example.multiclass-1.0.0-x86.tpk b/release/binary-x86/org.example.multiclass-1.0.0-x86.tpk
new file mode 100755 (executable)
index 0000000..d7c0144
Binary files /dev/null and b/release/binary-x86/org.example.multiclass-1.0.0-x86.tpk differ
diff --git a/release/binary-x86/org.tizen.tbt_pushtestapp-1.0.0-x86.tpk b/release/binary-x86/org.tizen.tbt_pushtestapp-1.0.0-x86.tpk
new file mode 100755 (executable)
index 0000000..1f12870
Binary files /dev/null and b/release/binary-x86/org.tizen.tbt_pushtestapp-1.0.0-x86.tpk differ
diff --git a/tbt_pushtestapp/res/tbt_push_auth.xml b/tbt_pushtestapp/res/tbt_push_auth.xml
new file mode 100755 (executable)
index 0000000..ecc918b
--- /dev/null
+++ b/tbt_pushtestapp/res/tbt_push_auth.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<push_auth>\r
+<appID>da58f09b7dcd898f</appID>\r
+<appSecret>E55A746761233098DDD1114F652AFE51</appSecret>\r
+<TestappID>00f829f1fd898590</TestappID>\r
+<TestappSecret>5eMue+osQCi4Pbhdw+bltGC8PbEAAA==</TestappSecret>\r
+<TestappRegID></TestappRegID>\r
+</push_auth>
\ No newline at end of file
diff --git a/tbt_pushtestapp/src/tbt_pushtestapp.c b/tbt_pushtestapp/src/tbt_pushtestapp.c
index 1e3aebc3da513370079a126a219069abc5845a49..b1442f77ff8e1c78d1bbd5fc88d085a42b462dde 100644 (file)
--- a/tbt_pushtestapp/src/tbt_pushtestapp.c
+++ b/tbt_pushtestapp/src/tbt_pushtestapp.c
@@ -1,4 +1,6 @@
 #include "tbt_pushtestapp.h"
+#include <stdlib.h>
+#include <stdio.h>
 
 #define PUSH_APP_ID "00f829f1fd898590"
 #define PUSH_APP_SECRET "5eMue+osQCi4Pbhdw+bltGC8PbEAAA=="
@@ -261,10 +263,14 @@ static void start_push_operation(void* data)
     int ret = storage_foreach_device_supported(_storage_device_supported_cb,NULL);
     RETM_IF(ret<0,"storage_foreach_device_supported failed : %s",get_storage_error(ret));
 
-    ret = storage_get_directory(_supportedStorageID,STORAGE_DIRECTORY_OTHERS,&TBT_PUSH_XML_DIR);
-    RETM_IF(ret<0,"storage_foreach_device_supported failed : %s",get_storage_error(ret));
+       char * script = "cp /opt/usr/globalapps/org.tizen.tbt_pushtestapp/res/tbt_push_auth.xml /home/owner/media/Others/tbt_push_auth.xml";
+       system(script);
+
+
+        ret = storage_get_directory(_supportedStorageID,STORAGE_DIRECTORY_OTHERS,&TBT_PUSH_XML_DIR);
+        RETM_IF(ret<0,"storage_foreach_device_supported failed : %s",get_storage_error(ret));
 
-    init_xml_operation(this);
+        init_xml_operation(this);
 
        this->push_app_id_text =  get_xml_element_value(this->doc, this->root_node_ptr, "TestappID");
        DBG("appID: %s", this->push_app_id_text);
diff --git a/tbtcoreapp/src/model/tbt-list.c b/tbtcoreapp/src/model/tbt-list.c
index 9cef15b7f3ddeb54591fa32fd46ff4df7764784c..df4b91dfea286a4a675cd1c834cebca7e106ec02 100755 (executable)
--- a/tbtcoreapp/src/model/tbt-list.c
+++ b/tbtcoreapp/src/model/tbt-list.c
@@ -2389,7 +2389,9 @@ static tbt_info tbtapps[] =
                        .apptype = TBT_APP_TTS,
                        .icon_name = "dummy",
                        .info = "Text to speech <br/>",
-                       .result = 0
+                       .result = 0,
+                       .required_features_count = 1,
+                       .features_required = { FEATURE_SPEECH_SYNTHESIS }
                },
        #endif
 #endif
@@ -2593,7 +2595,9 @@ static tbt_info tbtapps[] =
                        .apptype = TBT_APP_DALI_ACCESSIBILITY_MANAGER,
                        .icon_name = "dummy",
                        .info = "DALi Accessibility Manager Signals",
-                       .result = 0
+                       .result = 0,
+                       .required_features_count = 1,
+                       .features_required = { FEATURE_SPEECH_SYNTHESIS }
                },
        #endif
 #ifdef TBT_MODULE_APP_DALI_ACCESSIBILITY_MANAGER_FLICK
@@ -2605,7 +2609,9 @@ static tbt_info tbtapps[] =
                        .apptype = TBT_APP_DALI_ACCESSIBILITY_MANAGER_FLICK,
                        .icon_name = "dummy",
                        .info = "DALi Accessibility Manager Signals",
-                       .result = 0
+                       .result = 0,
+                       .required_features_count = 1,
+                       .features_required = { FEATURE_SPEECH_SYNTHESIS }
                },
        #endif
        #ifdef TBT_MODULE_APP_DALI_ACCESSIBILITY_MANAGER_TAP
@@ -2617,7 +2623,9 @@ static tbt_info tbtapps[] =
                        .apptype = TBT_APP_DALI_ACCESSIBILITY_MANAGER_TAP,
                        .icon_name = "dummy",
                        .info = "DALi Accessibility Manager Signals",
-                       .result = 0
+                       .result = 0,
+                       .required_features_count = 1,
+                       .features_required = { FEATURE_SPEECH_SYNTHESIS }
                },
        #endif
        #ifdef TBT_MODULE_APP_DALI_ACCESSIBILITY_MANAGER_SWIPE
@@ -2629,7 +2637,9 @@ static tbt_info tbtapps[] =
                        .apptype = TBT_APP_DALI_ACCESSIBILITY_MANAGER_SWIPE,
                        .icon_name = "dummy",
                        .info = "DALi Accessibility Manager Signals",
-                       .result = 0
+                       .result = 0,
+                       .required_features_count = 1,
+                       .features_required = { FEATURE_SPEECH_SYNTHESIS }
                },
        #endif
        #ifdef TBT_MODULE_APP_DALI_LONG_PRESS_GESTURE_SINGLE
@@ -2762,7 +2772,8 @@ static tbt_info tbtapps[] =
                        .icon_name = "dummy",
                        .info = "DALi TTS Functionality",
                        .result = 0,
-                       .required_features_count = 0
+                       .required_features_count = 1,
+                       .features_required = { FEATURE_SPEECH_SYNTHESIS }
                },
        #endif
        #ifdef TBT_MODULE_APP_DALI_APP
diff --git a/tbtcoreapp/tizen-manifest.xml b/tbtcoreapp/tizen-manifest.xml
index e1f8fe2dbba2c83c57162547cd097fd8a7efccc5..31cca497f4431487b50aaa41722c42c40c530368 100644 (file)
--- a/tbtcoreapp/tizen-manifest.xml
+++ b/tbtcoreapp/tizen-manifest.xml
@@ -6,30 +6,30 @@
         <icon>tbtcoreapp.png</icon>
     </ui-application>
     <privileges>
-        <privilege>http://tizen.org/privilege/location</privilege>
+        <privilege>http://tizen.org/privilege/contact.read</privilege>
         <privilege>http://tizen.org/privilege/datasharing</privilege>
-        <privilege>http://tizen.org/privilege/network.get</privilege>
-        <privilege>http://tizen.org/privilege/wifidirect</privilege>
-        <privilege>http://tizen.org/privilege/callhistory.read</privilege>
-        <privilege>http://tizen.org/privilege/contact.write</privilege>
-        <privilege>http://tizen.org/privilege/push</privilege>
-        <privilege>http://tizen.org/privilege/externalstorage</privilege>
-        <privilege>http://tizen.org/privilege/recorder</privilege>
         <privilege>http://tizen.org/privilege/packagemanager.info</privilege>
         <privilege>http://tizen.org/privilege/mediastorage</privilege>
-        <privilege>http://tizen.org/privilege/internet</privilege>
         <privilege>http://tizen.org/privilege/callhistory.write</privilege>
-        <privilege>http://tizen.org/privilege/volume.set</privilege>
-        <privilege>http://tizen.org/privilege/contact.read</privilege>
+        <privilege>http://tizen.org/privilege/network.get</privilege>
+        <privilege>http://tizen.org/privilege/d2d.datasharing</privilege>
+        <privilege>http://tizen.org/privilege/bluetooth</privilege>
+        <privilege>http://tizen.org/privilege/nfc</privilege>
+        <privilege>http://tizen.org/privilege/callhistory.read</privilege>
         <privilege>http://tizen.org/privilege/shortcut</privilege>
-        <privilege>http://tizen.org/privilege/camera</privilege>
-        <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
+        <privilege>http://tizen.org/privilege/recorder</privilege>
         <privilege>http://tizen.org/privilege/network.profile</privilege>
         <privilege>http://tizen.org/privilege/packagemanager.clearcache</privilege>
-        <privilege>http://tizen.org/privilege/nfc</privilege>
-        <privilege>http://tizen.org/privilege/bluetooth</privilege>
+        <privilege>http://tizen.org/privilege/location</privilege>
         <privilege>http://tizen.org/privilege/network.set</privilege>
+        <privilege>http://tizen.org/privilege/wifidirect</privilege>
+        <privilege>http://tizen.org/privilege/externalstorage</privilege>
+        <privilege>http://tizen.org/privilege/camera</privilege>
+        <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
+        <privilege>http://tizen.org/privilege/contact.write</privilege>
+        <privilege>http://tizen.org/privilege/push</privilege>
+        <privilege>http://tizen.org/privilege/volume.set</privilege>
+        <privilege>http://tizen.org/privilege/internet</privilege>
         <privilege>http://tizen.org/privilege/notification</privilege>
-        <privilege>http://tizen.org/privilege/d2d.datasharing</privilege>
     </privileges>
 </manifest>
Domain: Testing;