Merge remote-tracking branch 'github/master' into tizen

diff --git a/src/Tizen.Applications.Common/Tizen.Applications/CoreApplication.cs b/src/Tizen.Applications.Common/Tizen.Applications/CoreApplication.cs
old mode 100644 (file)
new mode 100755 (executable)
index 732c37c..b2c48c4
--- a/src/Tizen.Applications.Common/Tizen.Applications/CoreApplication.cs
+++ b/src/Tizen.Applications.Common/Tizen.Applications/CoreApplication.cs
@@ -112,18 +112,13 @@ namespace Tizen.Applications
             _backend.AddEventHandler<RegionFormatChangedEventArgs>(EventType.RegionFormatChanged, OnRegionFormatChanged);
             _backend.AddEventHandler<DeviceOrientationEventArgs>(EventType.DeviceOrientationChanged, OnDeviceOrientationChanged);
 
-            string[] argsClone = null;
-
-            if (args == null)
-            {
-                argsClone = new string[1];
-            }
-            else
+            string[] argsClone = new string[args.Length + 1];
+            if (args.Length > 1)
             {
-                argsClone = new string[args.Length + 1];
                 args.CopyTo(argsClone, 1);
             }
             argsClone[0] = string.Empty;
+
             _backend.Run(argsClone);
         }
 

diff --git a/src/Tizen.Applications.WatchApplication/Tizen.Applications.CoreBackend/WatchCoreBackend.cs b/src/Tizen.Applications.WatchApplication/Tizen.Applications.CoreBackend/WatchCoreBackend.cs
old mode 100755 (executable)
new mode 100644 (file)
index 01f0bc1..a244b2c
--- a/src/Tizen.Applications.WatchApplication/Tizen.Applications.CoreBackend/WatchCoreBackend.cs
+++ b/src/Tizen.Applications.WatchApplication/Tizen.Applications.CoreBackend/WatchCoreBackend.cs
@@ -116,6 +116,8 @@ namespace Tizen.Applications.CoreBackend
 
         public void Run(string[] args)
         {
+            TizenSynchronizationContext.Initialize();
+
             Interop.Watch.ErrorCode err = Interop.Watch.ErrorCode.None;
 
             err = Interop.Watch.AddEventHandler(out _lowMemoryEventHandle, Interop.Watch.AppEventType.LowMemory, _lowMemoryCallback, IntPtr.Zero);

diff --git a/src/Tizen.Applications.WidgetApplication/Tizen.Applications.CoreBackend/WidgetCoreBackend.cs b/src/Tizen.Applications.WidgetApplication/Tizen.Applications.CoreBackend/WidgetCoreBackend.cs
old mode 100755 (executable)
new mode 100644 (file)
index eee864b..e05eaa2
--- a/src/Tizen.Applications.WidgetApplication/Tizen.Applications.CoreBackend/WidgetCoreBackend.cs
+++ b/src/Tizen.Applications.WidgetApplication/Tizen.Applications.CoreBackend/WidgetCoreBackend.cs
@@ -109,6 +109,8 @@ namespace Tizen.Applications.CoreBackend
 
         public void Run(string[] args)
         {
+            TizenSynchronizationContext.Initialize();
+
             Interop.Widget.ErrorCode err = Interop.Widget.ErrorCode.None;
             err = Interop.Widget.AddEventHandler(out _lowMemoryEventHandle, Interop.Widget.AppEventType.LowMemory, _lowMemoryCallback, IntPtr.Zero);
             if (err != Interop.Widget.ErrorCode.None)

diff --git a/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothAdapter.cs b/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothAdapter.cs
index b23b03a..2cb8354 100644 (file)
--- a/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothAdapter.cs
+++ b/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothAdapter.cs
@@ -373,7 +373,7 @@ namespace Tizen.Network.Bluetooth
         }
 
         /// <summary>
-        /// Enables the local Bluetooth adapter, asynchronously.
+        /// Enables the local Bluetooth adapter asynchronously.
         /// </summary>
         /// <since_tizen> 6 </since_tizen>
         /// <feature>http://tizen.org/feature/network.bluetooth</feature>
@@ -387,7 +387,7 @@ namespace Tizen.Network.Bluetooth
         }
 
         /// <summary>
-        /// Disables the local Bluetooth adapter, asynchronously.
+        /// Disables the local Bluetooth adapter asynchronously.
         /// </summary>
         /// <since_tizen> 6 </since_tizen>
         /// <feature>http://tizen.org/feature/network.bluetooth</feature>
@@ -415,7 +415,7 @@ namespace Tizen.Network.Bluetooth
         }
 
         /// <summary>
-        /// Enables the discoverable mode.
+        /// Enables the discoverable mode for the duration.
         /// </summary>
         /// <since_tizen> 6 </since_tizen>
         /// <param name="duration">The duration until the discoverable mode is to be disabled(in seconds).</param>

diff --git a/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothAudio.cs b/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothAudio.cs
index 8a20ab2..67277b3 100644 (file)
--- a/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothAudio.cs
+++ b/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothAudio.cs
@@ -108,7 +108,7 @@ namespace Tizen.Network.Bluetooth
         }
 
         /// <summary>
-        /// Opens a AG(Audio Gateway) SCO(Synchronous Connection Oriented link) to connected remote device, asynchronously.
+        /// Opens a AG(Audio Gateway) SCO(Synchronous Connection Oriented link) to connected remote device asynchronously.
         /// </summary>
         /// <since_tizen> 6 </since_tizen>
         /// <feature>http://tizen.org/feature/network.bluetooth</feature>
@@ -123,7 +123,7 @@ namespace Tizen.Network.Bluetooth
         }
 
         /// <summary>
-        /// Closes a AG(Audio Gateway) SCO(Synchronous Connection Oriented link) to connected remote device, asynchronously.
+        /// Closes a AG(Audio Gateway) SCO(Synchronous Connection Oriented link) to connected remote device asynchronously.
         /// </summary>
         /// <since_tizen> 6 </since_tizen>
         /// <feature>http://tizen.org/feature/network.bluetooth</feature>

diff --git a/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothLeAdapter.cs b/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothLeAdapter.cs
index 91ca0ff..ded75cd 100644 (file)
--- a/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothLeAdapter.cs
+++ b/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothLeAdapter.cs
@@ -794,7 +794,7 @@ namespace Tizen.Network.Bluetooth {
                 serviceDataPtr = Marshal.AllocHGlobal(data.DataLength);
                 Marshal.Copy(data.Data, 0, serviceDataPtr, data.DataLength);
 
-                for (int i = 0; i < 3; i++)
+                for (int i = 0; i < data.DataLength; i++)
                     Log.Error (Globals.LogTag, " service data is  " + data.Data [i]);
                 int ret = Interop.Bluetooth.AddAdvertisingServiceData(GetHandle(), packetType,
                     data.Uuid, serviceDataPtr, data.DataLength);