merge with master

21 files changed, 31 insertions, 65 deletions

diff --git a/AUTHORS b/AUTHORS
index 46d1687..0bb1836 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,2 @@
-Jinmin Jung <jinmin@samsung.com>
-DoHyun Pyun <dh79.pyun@samsung.com>
+ByungWoo Lee <bw1212.lee@samsung.com>
+Kangho Hur <kangho.hur@samsung.com>
diff --git a/LICENSE.APLv2 b/LICENSE
index 43e91eb..9c13a9b 100644
--- a/LICENSE.APLv2
+++ b/LICENSE
@@ -1,3 +1,4 @@
+Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.

 

                                  Apache License

                            Version 2.0, January 2004

diff --git a/NOTICE b/NOTICE
deleted file mode 100644
index 0e0f016..0000000
--- a/NOTICE
+++ /dev/null
@@ -1,3 +0,0 @@
-Copyright (c) Samsung Electronics Co., Ltd. All rights reserved.
-Except as noted, this software is licensed under Apache License, Version 2.
-Please, see the LICENSE.APLv2 file for Apache License terms and conditions.
diff --git a/include/bluetooth.h b/include/bluetooth.h
index e1fd73e..3155214 100644
--- a/include/bluetooth.h
+++ b/include/bluetooth.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the License);
  * you may not use this file except in compliance with the License.
@@ -2309,19 +2309,6 @@ int bt_nap_deactivate(void);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_PAN_NAP_MODULE
- * @brief Disconnects the all PANUs(Personal Area Networking User) which are connected to you.
- * @return 0 on success, otherwise a negative error value.
- * @retval #BT_ERROR_NONE  Successful
- * @retval #BT_ERROR_NOT_INITIALIZED  Not initialized
- * @retval #BT_ERROR_NOT_ENABLED  Not enabled
- * @retval #BT_ERROR_OPERATION_FAILED  Operation failed
- * @pre The Bluetooth NAP service must be activated with bt_nap_activate().
- * @see bt_nap_activate()
- */
-int bt_nap_disconnect_all(void);
-
-/**
- * @ingroup CAPI_NETWORK_BLUETOOTH_PAN_NAP_MODULE
  * @brief  Registers a callback function that will be invoked when the connection state changes.
  * @param[in] callback The callback function to register
  * @param[in] user_data The user data to be passed to the callback function
diff --git a/include/bluetooth_private.h b/include/bluetooth_private.h
index c55a8fe..0aaed69 100644
--- a/include/bluetooth_private.h
+++ b/include/bluetooth_private.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the License);
  * you may not use this file except in compliance with the License.
diff --git a/packaging/capi-network-bluetooth.spec b/packaging/capi-network-bluetooth.spec
index fdd266c..a76cc7c 100644
--- a/packaging/capi-network-bluetooth.spec
+++ b/packaging/capi-network-bluetooth.spec
@@ -1,7 +1,7 @@
 #sbs-git:slp/api/bluetooth capi-network-bluetooth 0.1.0 686c444083e4197845c768e5dd034022b1dfa250
 Name:       capi-network-bluetooth
 Summary:    Network Bluetooth Framework
-Version:    0.1.39
+Version:    0.1.38
 Release:    1
 Group:      TO_BE/FILLED_IN
 License:    Apache License, Version 2.0
diff --git a/src/bluetooth-adapter.c b/src/bluetooth-adapter.c
index f9c96d6..00a1b3b 100644
--- a/src/bluetooth-adapter.c
+++ b/src/bluetooth-adapter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the License);
  * you may not use this file except in compliance with the License.
diff --git a/src/bluetooth-audio.c b/src/bluetooth-audio.c
index 59b1c74..256902e 100644
--- a/src/bluetooth-audio.c
+++ b/src/bluetooth-audio.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the License);
  * you may not use this file except in compliance with the License.
diff --git a/src/bluetooth-avrcp.c b/src/bluetooth-avrcp.c
index 9eb4cd6..a7b7e19 100644
--- a/src/bluetooth-avrcp.c
+++ b/src/bluetooth-avrcp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the License);
  * you may not use this file except in compliance with the License.
diff --git a/src/bluetooth-common.c b/src/bluetooth-common.c
index 67a6cc1..710fd6a 100644
--- a/src/bluetooth-common.c
+++ b/src/bluetooth-common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the License);
  * you may not use this file except in compliance with the License.
diff --git a/src/bluetooth-device.c b/src/bluetooth-device.c
index 442f0b9..6b7cb9d 100644
--- a/src/bluetooth-device.c
+++ b/src/bluetooth-device.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the License);
  * you may not use this file except in compliance with the License.
diff --git a/src/bluetooth-gatt.c b/src/bluetooth-gatt.c
index b159fb0..7451e88 100644
--- a/src/bluetooth-gatt.c
+++ b/src/bluetooth-gatt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the License);
  * you may not use this file except in compliance with the License.
diff --git a/src/bluetooth-hdp.c b/src/bluetooth-hdp.c
index 7abfc81..942c93c 100644
--- a/src/bluetooth-hdp.c
+++ b/src/bluetooth-hdp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the License);
  * you may not use this file except in compliance with the License.
diff --git a/src/bluetooth-hid.c b/src/bluetooth-hid.c
index 6d4503a..8c00eba 100644
--- a/src/bluetooth-hid.c
+++ b/src/bluetooth-hid.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the License);
  * you may not use this file except in compliance with the License.
diff --git a/src/bluetooth-opp-client.c b/src/bluetooth-opp-client.c
index 5e91927..4270379 100644
--- a/src/bluetooth-opp-client.c
+++ b/src/bluetooth-opp-client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the License);
  * you may not use this file except in compliance with the License.
diff --git a/src/bluetooth-opp-server.c b/src/bluetooth-opp-server.c
index f6858da..f16d553 100644
--- a/src/bluetooth-opp-server.c
+++ b/src/bluetooth-opp-server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the License);
  * you may not use this file except in compliance with the License.
diff --git a/src/bluetooth-pan.c b/src/bluetooth-pan.c
index eb27268..db60c93 100644
--- a/src/bluetooth-pan.c
+++ b/src/bluetooth-pan.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the License);
  * you may not use this file except in compliance with the License.
@@ -52,24 +52,6 @@ int bt_nap_deactivate(void)
 	return error;
 }
 
-/* bluez don't support the disconnect API about NAP server */
-/* So we implement this, deactivate the server and re-activate the server */
-int bt_nap_disconnect_all(void)
-{
-	int error = BT_ERROR_NONE;
-
-	BT_CHECK_INIT_STATUS();
-	error = bluetooth_network_deactivate_server();
-	error = _bt_get_error_code(error);
-	if (error != BT_ERROR_NONE) {
-		BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error), error);
-	} else {
-		return bt_nap_activate();
-	}
-
-	return error;
-}
-
 int bt_nap_set_connection_state_changed_cb(
 				bt_nap_connection_state_changed_cb callback,
 				void *user_data)
diff --git a/src/bluetooth-socket.c b/src/bluetooth-socket.c
index f3e4ec7..189256c 100644
--- a/src/bluetooth-socket.c
+++ b/src/bluetooth-socket.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the License);
  * you may not use this file except in compliance with the License.
diff --git a/test/bt_chat_client.c b/test/bt_chat_client.c
index 9413372..bfdd5e8 100644
--- a/test/bt_chat_client.c
+++ b/test/bt_chat_client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the License);
  * you may not use this file except in compliance with the License.
diff --git a/test/bt_chat_server.c b/test/bt_chat_server.c
index 8d7dd4e..60c18b1 100644
--- a/test/bt_chat_server.c
+++ b/test/bt_chat_server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the License);
  * you may not use this file except in compliance with the License.
diff --git a/test/bt_unit_test.c b/test/bt_unit_test.c
index e451752..c871acf 100644
--- a/test/bt_unit_test.c
+++ b/test/bt_unit_test.c
@@ -1,17 +1,24 @@
 /*
- * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
+ * capi-network-bluetooth
  *
- * Licensed under the Apache License, Version 2.0 (the License);
+ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Contact:  Hocheol Seo <hocheol.seo@samsung.com>
+ *		 Girishashok Joshi <girish.joshi@samsung.com>
+ *		 Chanyeol Park <chanyeol.park@samsung.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *		http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 
 /**
@@ -123,7 +130,6 @@ tc_table_t tc_table[] = {
 	/* Network functions */
 	{"bt_nap_activate"		, 110},
 	{"bt_nap_deactivate"		, 111},
-	{"bt_nap_disconnect_all"	, 112},
 
 	/* Device functions */
 	{"bt_device_set_authorization (true)"	, 120},
@@ -907,13 +913,6 @@ int test_input_callback(void *data)
 		}
 		break;
 
-	case 112:
-		ret = bt_nap_disconnect_all();
-		if (ret < BT_ERROR_NONE) {
-			TC_PRT("failed with [0x%04x]", ret);
-		}
-		break;
-
 	case 120: {
 		char *address;