Upgrade bluez5_37 :Merge the code from privatesubmit/tizen/20160414.030922accepted/tizen/wearable/20160414.091945accepted/tizen/tv/20160414.092045accepted/tizen/mobile/20160414.092019accepted/tizen/ivi/20160414.092030accepted/tizen/common/20160414.142549

branch:devel/bluetooth/master
================================================
commit 81e16d9fa48dc40f2dcb15aca9ce87ea50d9a85e
Author: Injun Yang <injun.yang@samsung.com>
Date:   Thu Mar 31 17:05:06 2016 +0900

 GATT Server : Handle property and write type

==============================================

Change-Id: I0d2b69488337b1f393fba43dc1268bd92ea6b6ac
Signed-off-by: h.sandeep <h.sandeep@samsung.com>

22 files changed, 16 insertions, 8 deletions

diff --git a/obexd/src/log.c b/obexd/src/log.c
index ace7ab64..f259728f 100644..100755
--- a/obexd/src/log.c
+++ b/obexd/src/log.c
@@ -125,7 +125,7 @@ void __obex_log_init(const char *debug, int detach)
 
 	openlog("obexd", option, LOG_DAEMON);
 
-	syslog(LOG_INFO, "OBEX daemon %s", VERSION);
+	info("OBEX daemon %s", VERSION);
 }
 
 void __obex_log_cleanup(void)
diff --git a/obexd/src/log.h b/obexd/src/log.h
index d9fb8678..d9fb8678 100644..100755
--- a/obexd/src/log.h
+++ b/obexd/src/log.h
diff --git a/obexd/src/main.c b/obexd/src/main.c
index 515405c6..00644c94 100644..100755
--- a/obexd/src/main.c
+++ b/obexd/src/main.c
@@ -44,14 +44,12 @@
 
 #include "gdbus/gdbus.h"
 
+#include "../client/manager.h"
+
 #include "log.h"
 #include "obexd.h"
 #include "server.h"
 
-#ifdef __TIZEN_PATCH__
-#include "../client/manager.h"
-#endif
-
 #define DEFAULT_CAP_FILE CONFIGDIR "/capability.xml"
 
 static GMainLoop *main_loop = NULL;
diff --git a/obexd/src/manager.c b/obexd/src/manager.c
index ce20b019..9fbac6f6 100644..100755
--- a/obexd/src/manager.c
+++ b/obexd/src/manager.c
@@ -800,7 +800,7 @@ static gboolean auth_error(GIOChannel *io, GIOCondition cond, void *user_data)
 	return FALSE;
 }
 
-int manager_request_authorization(struct obex_transfer *transfer, int32_t time,
+int manager_request_authorization(struct obex_transfer *transfer,
 					char **new_folder, char **new_name)
 {
 	struct obex_session *os = transfer->session;
diff --git a/obexd/src/manager.h b/obexd/src/manager.h
index 669b223f..d9781b20 100644..100755
--- a/obexd/src/manager.h
+++ b/obexd/src/manager.h
@@ -36,7 +36,7 @@ void manager_unregister_transfer(struct obex_transfer *transfer);
 void manager_emit_transfer_started(struct obex_transfer *transfer);
 void manager_emit_transfer_progress(struct obex_transfer *transfer);
 void manager_emit_transfer_completed(struct obex_transfer *transfer);
-int manager_request_authorization(struct obex_transfer *transfer, int32_t time,
+int manager_request_authorization(struct obex_transfer *transfer,
 					char **new_folder, char **new_name);
 
 DBusConnection *manager_dbus_get_connection(void);
diff --git a/obexd/src/map_ap.h b/obexd/src/map_ap.h
index da108fe6..da108fe6 100644..100755
--- a/obexd/src/map_ap.h
+++ b/obexd/src/map_ap.h
diff --git a/obexd/src/mimetype.c b/obexd/src/mimetype.c
index 833ddc72..833ddc72 100644..100755
--- a/obexd/src/mimetype.c
+++ b/obexd/src/mimetype.c
diff --git a/obexd/src/mimetype.h b/obexd/src/mimetype.h
index 79529b89..79529b89 100644..100755
--- a/obexd/src/mimetype.h
+++ b/obexd/src/mimetype.h
diff --git a/obexd/src/obex-priv.h b/obexd/src/obex-priv.h
index 355a7f87..355a7f87 100644..100755
--- a/obexd/src/obex-priv.h
+++ b/obexd/src/obex-priv.h
diff --git a/obexd/src/obex.c b/obexd/src/obex.c
index 90832468..d62839f1 100644..100755
--- a/obexd/src/obex.c
+++ b/obexd/src/obex.c
@@ -642,7 +642,17 @@ static void parse_name(struct obex_session *os, GObexPacket *req)
 
 	if (!g_obex_header_get_unicode(hdr, &name))
 		return;
-
+#ifdef __TIZEN_PATCH__
+	DBG("TYPE===>: %s", os->type);
+	if (name && strcmp(os->type, "x-bt/phonebook")) {
+		char *new_name;
+		new_name = strrchr(name, '/');
+		if (new_name) {
+			name = new_name + 1;
+			DBG("FileName %s", name);
+		}
+	}
+#endif
 	os->name = g_strdup(name);
 	DBG("NAME: %s", os->name);
 }
diff --git a/obexd/src/obex.h b/obexd/src/obex.h
index fc167475..fc167475 100644..100755
--- a/obexd/src/obex.h
+++ b/obexd/src/obex.h
diff --git a/obexd/src/obex.service.in b/obexd/src/obex.service.in
index bca3aef6..bca3aef6 100644..100755
--- a/obexd/src/obex.service.in
+++ b/obexd/src/obex.service.in
diff --git a/obexd/src/obexd.h b/obexd/src/obexd.h
index 41f28d65..41f28d65 100644..100755
--- a/obexd/src/obexd.h
+++ b/obexd/src/obexd.h
diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
index b369d00b..b369d00b 100644..100755
--- a/obexd/src/org.bluez.obex.service
+++ b/obexd/src/org.bluez.obex.service
diff --git a/obexd/src/plugin.c b/obexd/src/plugin.c
index 7d971b6c..7d971b6c 100644..100755
--- a/obexd/src/plugin.c
+++ b/obexd/src/plugin.c
diff --git a/obexd/src/plugin.h b/obexd/src/plugin.h
index 13d77695..13d77695 100644..100755
--- a/obexd/src/plugin.h
+++ b/obexd/src/plugin.h
diff --git a/obexd/src/server.c b/obexd/src/server.c
index db854233..db854233 100644..100755
--- a/obexd/src/server.c
+++ b/obexd/src/server.c
diff --git a/obexd/src/server.h b/obexd/src/server.h
index 278c35fc..278c35fc 100644..100755
--- a/obexd/src/server.h
+++ b/obexd/src/server.h
diff --git a/obexd/src/service.c b/obexd/src/service.c
index c088535e..c088535e 100644..100755
--- a/obexd/src/service.c
+++ b/obexd/src/service.c
diff --git a/obexd/src/service.h b/obexd/src/service.h
index 5d9d325f..5d9d325f 100644..100755
--- a/obexd/src/service.h
+++ b/obexd/src/service.h
diff --git a/obexd/src/transport.c b/obexd/src/transport.c
index 4984643e..4984643e 100644..100755
--- a/obexd/src/transport.c
+++ b/obexd/src/transport.c
diff --git a/obexd/src/transport.h b/obexd/src/transport.h
index 97e10d05..97e10d05 100644..100755
--- a/obexd/src/transport.h
+++ b/obexd/src/transport.h