Merge branch 'tizen_3.0' into tizen

diff --git a/packaging/webapi-plugins.spec b/packaging/webapi-plugins.spec
index 3853180..3603a3f 100644 (file)
--- a/packaging/webapi-plugins.spec
+++ b/packaging/webapi-plugins.spec
@@ -10,7 +10,7 @@
 %define crosswalk_extensions_path %{_libdir}/%{crosswalk_extensions}
 
 Name:       webapi-plugins
-Version:    0.66
+Version:    0.67
 Release:    0
 License:    Apache-2.0 and BSD-2.0 and MIT
 Group:      Development/Libraries

diff --git a/src/utils/utils_api.js b/src/utils/utils_api.js
index b16a006..038ecae 100644 (file)
--- a/src/utils/utils_api.js
+++ b/src/utils/utils_api.js
@@ -80,7 +80,7 @@ function Utils() {
     BLUETOOTH_GAP: 'http://tizen.org/privilege/bluetooth',
     BLUETOOTH_HEALTH: 'http://tizen.org/privilege/bluetooth',
     BLUETOOTH_SPP: 'http://tizen.org/privilege/bluetooth',
-    BLUETOOTHMANAGER: 'http://tizen.org/privilege/bluetooth',
+    BLUETOOTHMANAGER: 'http://tizen.org/privilege/bluetooth.admin',
     BLUETOOTH: 'http://tizen.org/privilege/bluetooth',
     BOOKMARK_READ: 'http://tizen.org/privilege/bookmark.admin',
     BOOKMARK_WRITE: 'http://tizen.org/privilege/bookmark.admin',
@@ -92,6 +92,7 @@ function Utils() {
     CONTACT_WRITE: 'http://tizen.org/privilege/contact.write',
     CONTENT_READ: 'http://tizen.org/privilege/content.write',
     CONTENT_WRITE: 'http://tizen.org/privilege/content.write',
+    D2D_DATASHARING: 'http://tizen.org/privilege/d2d.datasharing',
     DATACONTROL_CONSUMER: 'http://tizen.org/privilege/datasharing',
     DATASYNC: 'http://tizen.org/privilege/notexist',
     DOWNLOAD: 'http://tizen.org/privilege/download',
@@ -119,7 +120,7 @@ function Utils() {
     SECUREELEMENT: 'http://tizen.org/privilege/secureelement',
     SETTING: 'http://tizen.org/privilege/systemsettings.admin',
     SYSTEM: 'http://tizen.org/privilege/telephony',
-    SYSTEMMANAGER: 'http://tizen.org/privilege/systemmanager',
+    SYSTEMMANAGER: 'http://tizen.org/privilege/telephony',
     TELEPHONY: 'http://tizen.org/privilege/telephony',
     VOLUME_SET: 'http://tizen.org/privilege/volume.set'
   };