[TBT][Non-ACR][All][Changes done in script and code]

Change-Id: Ib01b76cfa05c4fc6528b7200c4b096c276c63f01
Signed-off-by: nibha2 <nibha.sharma@samsung.com>

diff --git a/release/binary-armv7l/org.tizen.coretbtwidgetapp-dali-1.0.0-arm.tpk b/release/binary-armv7l/org.tizen.coretbtwidgetapp-dali-1.0.0-arm.tpk
index be79ac8bfeaf5b4c288a1512715a1c6adec0ab86..23e00d4362e7390b962dfdb1d1d66df42b3cd426 100755 (executable)
Binary files a/release/binary-armv7l/org.tizen.coretbtwidgetapp-dali-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.coretbtwidgetapp-dali-1.0.0-arm.tpk differ

diff --git a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk
index 6d26bbc2982b71b645bac6811f96b31825fc26d2..c1d83c1b38a0d0021e01b56c1f39fed7c8cd85ea 100755 (executable)
Binary files a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk differ

diff --git a/release/binary-armv7l/org.tizen.tbtcoreapp-widget-new-dali-1.0.0-arm.tpk b/release/binary-armv7l/org.tizen.tbtcoreapp-widget-new-dali-1.0.0-arm.tpk
index 3f19d8bef393b1b079b1b2ee6bc7f64f9e01eca0..d2a75d6de505ec1adfe5b02a659f014afbf1b84a 100755 (executable)
Binary files a/release/binary-armv7l/org.tizen.tbtcoreapp-widget-new-dali-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.tbtcoreapp-widget-new-dali-1.0.0-arm.tpk differ

diff --git a/release/binary-x86/org.tizen.coretbtwidgetapp-dali-1.0.0-x86.tpk b/release/binary-x86/org.tizen.coretbtwidgetapp-dali-1.0.0-x86.tpk
index 1d1e801a817d977b851bad35badc9e06f7c276a0..bc9ce3b6f5d0ac23475ee2dae5b921b2781bf1cf 100755 (executable)
Binary files a/release/binary-x86/org.tizen.coretbtwidgetapp-dali-1.0.0-x86.tpk and b/release/binary-x86/org.tizen.coretbtwidgetapp-dali-1.0.0-x86.tpk differ

diff --git a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk
index 7074e34b0d09322902e6bc6e924a13c94cca3b75..7f380583de975ea983894f84f741fd1d97e65a68 100755 (executable)
Binary files a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk differ

diff --git a/release/binary-x86/org.tizen.tbtcoreapp-widget-new-dali-1.0.0-x86.tpk b/release/binary-x86/org.tizen.tbtcoreapp-widget-new-dali-1.0.0-x86.tpk
index 04dd62e2888283b998d84756ae0ac0bd642f8fea..33979321f9e61234d02eab20f1dbe1f371b0e011 100755 (executable)
Binary files a/release/binary-x86/org.tizen.tbtcoreapp-widget-new-dali-1.0.0-x86.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-widget-new-dali-1.0.0-x86.tpk differ

diff --git a/scripts_tpk/tpkbuild.sh b/scripts_tpk/tpkbuild.sh
index 6d33af942ebffa5e968fb3dd7672ec6e9358afb6..93b464ef1ea1e2a544e5f992a0eaa9cb4c9252e0 100755 (executable)
--- a/scripts_tpk/tpkbuild.sh
+++ b/scripts_tpk/tpkbuild.sh
@@ -152,6 +152,11 @@ modulearray=(org.tizen.coretbt_dataprovider org.tizen.coretbt_serviceapp org.tiz
                                echo ""$reset
                        fi
                done
+               sdb push $PWD/release/binary-$ARCH/org.example.widget-1.0.0-$ARCH_TYPE.tpk /tmp
+               echo ""$reset
+               echo $green"Installing Package $MOD_NAME"
+               sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.example.widget-1.0.0-$ARCH_TYPE.tpk" $EXECUTION_USER
+               echo ""$reset
        elif [ "$MOD_NAME" =  "multiclass" ]; then
                eval launcher=(`sdb shell "app_launcher -l | grep org.example.$MOD_NAME"`)
                val=${launcher[1]}
@@ -184,6 +189,16 @@ modulearray=(org.tizen.coretbt_dataprovider org.tizen.coretbt_serviceapp org.tiz
                        sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.$MOD_NAME-1.0.0-$ARCH_TYPE.tpk" $EXECUTION_USER
                        echo ""$reset
                fi
+        fi
+       echo "$MOD_NAME"
+       if [ "$MOD_NAME" = "tbtcoreapp-dali" ]; then
+                 sdb push $PWD/release/binary-$ARCH/org.example.widget-1.0.0-$ARCH_TYPE.tpk /tmp
+                 echo ""$reset
+                 echo $green"Installing Package $MOD_NAME"
+                 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.example.widget-1.0.0-$ARCH_TYPE.tpk" $EXECUTION_USER
+                 echo ""$reset
+        fi
+
        echo ""$reset
        echo $yellow"Pushing media files"
        sdb push $PWD/release/binary-$ARCH/dog_1024_960.gif /home/$EXECUTION_USER/media/Images
@@ -211,7 +226,6 @@ modulearray=(org.tizen.coretbt_dataprovider org.tizen.coretbt_serviceapp org.tiz
        sdb shell chsmack -e "User::App::Shared" /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data/iotcon-test-svr-db-server.dat
 
        echo ""$reset
-       fi
        sdb root off
 }
 

diff --git a/tbtcoreapp/src/model/tbt-list.c b/tbtcoreapp/src/model/tbt-list.c
index 8f8c7ab46b90f52149037252ffb4c0bca86c867e..584464d07ad6fd47a8a85ee35bf82b8021e81914 100755 (executable)
--- a/tbtcoreapp/src/model/tbt-list.c
+++ b/tbtcoreapp/src/model/tbt-list.c
@@ -591,7 +591,8 @@ static tbt_info tbtapps[] =
                        .icon_name = "dummy",
                        .info = "Test Type One<br/>"
                                        "1.Bluetooth On<br/>"
-                                       "2. Destroy Bonding callback Invoked<br/>"
+                                       "2.Open bluetooth setting page, connect with some device and then unpair with the connected device<br/>"
+                                       "3. Destroy Bonding callback Invoked<br/>"
                                        "<br/>Test Type Two<br/>"
                                        "1. Bluetooth Off<br/>"
                                        "2. Correct Error Message Displayed",

diff --git a/tbtcoreapp/src/view/tbt-bluetooth-callback-view.c b/tbtcoreapp/src/view/tbt-bluetooth-callback-view.c
index 5270cfc93cc91f35521f38237e748be974644870..a7c9d087ee912b2cd19baf7f92877a8121802eda 100644 (file)
--- a/tbtcoreapp/src/view/tbt-bluetooth-callback-view.c
+++ b/tbtcoreapp/src/view/tbt-bluetooth-callback-view.c
@@ -180,6 +180,8 @@ bluetooth_view *bluetooth_callback_view_add(Evas_Object *navi, tbt_info *tbt_inf
                ui_utils_guide_instruction_popup_button(navi, "Instructions:<br/>Test Type One<br/>1.Bluetooth On<br/>2. Create Bonding callback Invoked<br/><br/>Test Type Two<br/>1. Bluetooth Off<br/>2. Correct Error Message Displayed<br/><b>Note:You can also refer info section");
 
                char resultc[256] ={0,};
+               sprintf(resultc, "result = %s", "Maually ON bluetooth and invoke create bond callback");
+                ui_utils_label_set_text(this->create_label, resultc, "left");
                ret = bt_device_set_bond_created_cb(Bluetooth_bt_device_bond_created_cb_p, this);
                DBG("bt_device_set_bond_created_cb %d", ret);
                RETVM_IF(ret != BT_ERROR_NONE && ret != BT_ERROR_NOT_SUPPORTED, NULL, "bt_device_set_bond_created_cb failed : %s", get_bluetooth_error(ret));
@@ -191,10 +193,10 @@ bluetooth_view *bluetooth_callback_view_add(Evas_Object *navi, tbt_info *tbt_inf
                        elm_object_text_set(popup, "Bluetooth is not supported");
                        RETVM_IF(!this->view, NULL,"Bluetooth is not supported");
                }
-               ret = bt_device_create_bond(remote_address);
-               DBG("bt_device_create_bond %d", ret);
-               sprintf(resultc, "result = %s", get_bluetooth_error(ret));
-               ui_utils_label_set_text(this->create_label, resultc, "left");
+               //ret = bt_device_create_bond(remote_address);
+               //DBG("bt_device_create_bond %d", ret);
+               //sprintf(resultc, "result = %s", get_bluetooth_error(ret));
+               //ui_utils_label_set_text(this->create_label, resultc, "left");
        }
 
        else if (this->view->tbt_info->apptype == TBT_APP_BT_CALLBACK_DESTROY_BOND_TEST)
@@ -205,6 +207,8 @@ bluetooth_view *bluetooth_callback_view_add(Evas_Object *navi, tbt_info *tbt_inf
                ui_utils_guide_instruction_popup_button(navi, "Instructions:<br/>Test Type One<br/>1.Bluetooth On<br/>2. Destroy Bonding callback Invoked<br/><br/>Test Type Two<br/>1. Bluetooth Off<br/>2. Correct Error Message Displayed<br/><b>Note:You can also refer info section");
 
                char resultc[256] ={0,};
+               sprintf(resultc, "result = %s", "Maually ON bluetooth and invoke destroy bond callback");
+                ui_utils_label_set_text(this->create_label, resultc, "left");
                ret = bt_device_set_bond_destroyed_cb(Bluetooth_bt_device_bond_destroyed_cb_p, this);
                RETVM_IF(ret != BT_ERROR_NONE && ret != BT_ERROR_NOT_SUPPORTED, NULL, "bt_device_set_bond_created_cb failed : %s", get_bluetooth_error(ret));
 
@@ -215,14 +219,14 @@ bluetooth_view *bluetooth_callback_view_add(Evas_Object *navi, tbt_info *tbt_inf
                        elm_object_text_set(popup, "Bluetooth is not supported");
                        RETVM_IF(!this->view, NULL,"Bluetooth is not supported");
                }
-               ret = bt_device_create_bond(remote_address);
-               DBG("bt_device_create_bond %d", ret);
-               sprintf(resultc, "result = %s", get_bluetooth_error(ret));
-               ui_utils_label_set_text(this->create_label, resultc, "left");
-
-               ret = bt_device_destroy_bond(remote_address);
-               sprintf(resultc, "result = %s", get_bluetooth_error(ret));
-               ui_utils_label_set_text(this->create_label, resultc, "left");
+               //ret = bt_device_create_bond(remote_address);
+               //DBG("bt_device_create_bond %d", ret);
+               //sprintf(resultc, "result = %s", get_bluetooth_error(ret));
+               //ui_utils_label_set_text(this->create_label, resultc, "left");
+
+               //ret = bt_device_destroy_bond(remote_address);
+               //sprintf(resultc, "result = %s", get_bluetooth_error(ret));
+               //ui_utils_label_set_text(this->create_label, resultc, "left");
        }
 
        else if (this->view->tbt_info->apptype == TBT_APP_BT_CALLBACK_DISCOVER_DEVICES_TEST)