Sync with Tizen 2.4

Change-Id: I33a88302b9ed5cb86ff7c91808fc57889b98375d
Signed-off-by: HyiHong Chae <hh.chae@samsung.com>

diff --git a/include/mtp.h b/include/mtp.h
index 1297417..bae4233 100755 (executable)
--- a/include/mtp.h
+++ b/include/mtp.h
@@ -141,7 +141,8 @@ typedef enum {
        MTP_EVENT_OBJECT_ADDED, /**< Object is added */
        MTP_EVENT_OBJECT_REMOVED, /**< Object is removed */
        MTP_EVENT_DEVICE_ADDED, /**< Device is added */
-       MTP_EVENT_DEVICE_REMOVED /**< Device is removed */
+       MTP_EVENT_DEVICE_REMOVED, /**< Device is removed */
+       MTP_EVENT_DAEMON_TERMINATED /**< Daemon is terminated */
 } mtp_event_e;
 
 /**

diff --git a/packaging/capi-network-mtp.spec b/packaging/capi-network-mtp.spec
index 139898b..3355fe0 100755 (executable)
--- a/packaging/capi-network-mtp.spec
+++ b/packaging/capi-network-mtp.spec
@@ -1,14 +1,14 @@
 Name:       capi-network-mtp
 Summary:    A MTP library in Native API
-Version:    1.2.1
+Version:    1.2.2
 Release:    1
 Group:      Network & Connectivity/Other
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 
 # This package would be built only TV
-%if "%{?tizen_profile_name}" != "tv"
-ExcludeArch: %{arm} %ix86 x86_64
+%if "%{?profile}" != "tv"
+ExcludeArch: %arm aarch64 %ix86 x86_64
 %endif
 
 BuildRequires:  cmake

diff --git a/test/mtp_unit_test.c b/test/mtp_unit_test.c
index 5aa8377..8667883 100755 (executable)
--- a/test/mtp_unit_test.c
+++ b/test/mtp_unit_test.c
@@ -1013,7 +1013,14 @@ int application_test_get_object_handle_using_all_image(void)
 
 void __test_mtp_event_cb(mtp_event_e state, int arg, void *user_data)
 {
+       int ret = 0;
+
        TC_PRT("state [%d] : %d", state, arg);
+
+       if (state == MTP_EVENT_DAEMON_TERMINATED) {
+               ret = mtp_deinitialize();
+               TC_PRT("ret[%d] : Terminated daemon", ret);
+       }
 }
 
 int application_test_event_callback(void)