projects
/
platform
/
core
/
csapi
/
tizenfx.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
74535f3
)
Release 4.0.0-preview1-00195
submit/tizen/20170913.001152
submit/tizen_4.0/20170913.001258
author
DotnetBuild
<dotnetbuild.tizen@gmail.com>
Wed, 13 Sep 2017 00:10:55 +0000
(09:10 +0900)
committer
DotnetBuild
<dotnetbuild.tizen@gmail.com>
Wed, 13 Sep 2017 00:10:55 +0000
(09:10 +0900)
packaging/csapi-tizenfx.spec
patch
|
blob
|
history
src/ElmSharp.Wearable/Interop/Interop.Eext.Rotary.cs
patch
|
blob
|
history
src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothAdapter.cs
patch
|
blob
|
history
src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothAdapterImpl.cs
patch
|
blob
|
history
diff --git
a/packaging/csapi-tizenfx.spec
b/packaging/csapi-tizenfx.spec
index
d5c9e9b
..
5271ff5
100644
(file)
--- a/
packaging/csapi-tizenfx.spec
+++ b/
packaging/csapi-tizenfx.spec
@@
-10,7
+10,7
@@
Name: csapi-tizenfx
Summary: Assemblies of Tizen .NET
Name: csapi-tizenfx
Summary: Assemblies of Tizen .NET
-Version: 4.0.0.19
4
+Version: 4.0.0.19
5
Release: 1
Group: Development/Libraries
License: Apache-2.0
Release: 1
Group: Development/Libraries
License: Apache-2.0
diff --git
a/src/ElmSharp.Wearable/Interop/Interop.Eext.Rotary.cs
b/src/ElmSharp.Wearable/Interop/Interop.Eext.Rotary.cs
index
619077d
..
aa004b1
100644
(file)
--- a/
src/ElmSharp.Wearable/Interop/Interop.Eext.Rotary.cs
+++ b/
src/ElmSharp.Wearable/Interop/Interop.Eext.Rotary.cs
@@
-34,6
+34,7
@@
internal static partial class Interop
CounterClockwise
}
CounterClockwise
}
+ [StructLayout(LayoutKind.Sequential)]
internal struct Eext_Rotary_Event_Info
{
public Eext_Rotary_Event_Direction Direction;
internal struct Eext_Rotary_Event_Info
{
public Eext_Rotary_Event_Direction Direction;
diff --git
a/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothAdapter.cs
b/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothAdapter.cs
index
ee9aca5
..
756944a
100644
(file)
--- a/
src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothAdapter.cs
+++ b/
src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothAdapter.cs
@@
-35,7
+35,14
@@
namespace Tizen.Network.Bluetooth
{
get
{
{
get
{
- return BluetoothAdapterImpl.Instance.IsBluetoothEnabled;
+ try
+ {
+ return BluetoothAdapterImpl.Instance.IsBluetoothEnabled;
+ }
+ catch (TypeInitializationException e)
+ {
+ throw e.InnerException;
+ }
}
}
}
}
@@
-85,7
+92,14
@@
namespace Tizen.Network.Bluetooth
}
set
{
}
set
{
- BluetoothAdapterImpl.Instance.Name = value;
+ try
+ {
+ BluetoothAdapterImpl.Instance.Name = value;
+ }
+ catch (TypeInitializationException e)
+ {
+ throw e.InnerException;
+ }
}
}
}
}
@@
-161,89
+175,186
@@
namespace Tizen.Network.Bluetooth
/// <summary>
/// The StateChanged event is raised when the Bluetooth adapter state is changed.
/// </summary>
/// <summary>
/// The StateChanged event is raised when the Bluetooth adapter state is changed.
/// </summary>
+ /// <exception cref="System.NotSupportedException">Thrown when the Bluetooth is not supported.</exception>
+ /// <exception cref="System.InvalidOperationException">Thrown when the Bluetooth is not enabled.</exception>
static public event EventHandler<StateChangedEventArgs> StateChanged
{
add
{
static public event EventHandler<StateChangedEventArgs> StateChanged
{
add
{
- BluetoothAdapterImpl.Instance.StateChanged += value;
+ try
+ {
+ BluetoothAdapterImpl.Instance.StateChanged += value;
+ }
+ catch (TypeInitializationException e)
+ {
+ throw e.InnerException;
+ }
}
remove
{
}
remove
{
- BluetoothAdapterImpl.Instance.StateChanged -= value;
+ try
+ {
+ BluetoothAdapterImpl.Instance.StateChanged -= value;
+ }
+ catch (TypeInitializationException e)
+ {
+ throw e.InnerException;
+ }
}
}
/// <summary>
/// The NameChanged event is raised when the Bluetooth adapter name is changed.
/// </summary>
}
}
/// <summary>
/// The NameChanged event is raised when the Bluetooth adapter name is changed.
/// </summary>
+ /// <exception cref="System.NotSupportedException">Thrown when the Bluetooth is not supported.</exception>
+ /// <exception cref="System.InvalidOperationException">Thrown when the Bluetooth is not enabled.</exception>
static public event EventHandler<NameChangedEventArgs> NameChanged
{
add
{
static public event EventHandler<NameChangedEventArgs> NameChanged
{
add
{
- BluetoothAdapterImpl.Instance.NameChanged += value;
+ try
+ {
+ BluetoothAdapterImpl.Instance.NameChanged += value;
+ }
+ catch (TypeInitializationException e)
+ {
+ throw e.InnerException;
+ }
}
remove
{
}
remove
{
- BluetoothAdapterImpl.Instance.NameChanged -= value;
+ try
+ {
+ BluetoothAdapterImpl.Instance.NameChanged -= value;
+ }
+ catch (TypeInitializationException e)
+ {
+ throw e.InnerException;
+ }
}
}
/// <summary>
/// The VisibilityModeChanged event is raised when the Bluetooth adapter visibility mode is changed.
/// </summary>
}
}
/// <summary>
/// The VisibilityModeChanged event is raised when the Bluetooth adapter visibility mode is changed.
/// </summary>
+ /// <exception cref="System.NotSupportedException">Thrown when the Bluetooth is not supported.</exception>
+ /// <exception cref="System.InvalidOperationException">Thrown when the Bluetooth is not enabled.</exception>
static public event EventHandler<VisibilityModeChangedEventArgs> VisibilityModeChanged
{
add
{
static public event EventHandler<VisibilityModeChangedEventArgs> VisibilityModeChanged
{
add
{
- BluetoothAdapterImpl.Instance.VisibilityModeChanged += value;
+ try
+ {
+ BluetoothAdapterImpl.Instance.VisibilityModeChanged += value;
+ }
+ catch (TypeInitializationException e)
+ {
+ throw e.InnerException;
+ }
}
remove
{
}
remove
{
- BluetoothAdapterImpl.Instance.VisibilityModeChanged -= value;
+ try
+ {
+ BluetoothAdapterImpl.Instance.VisibilityModeChanged -= value;
+ }
+ catch (TypeInitializationException e)
+ {
+ throw e.InnerException;
+ }
}
}
/// <summary>
/// The VisibilityDurationChanged event is raised very second until the visibility mode is changed to NonDiscoverable.
/// </summary>
}
}
/// <summary>
/// The VisibilityDurationChanged event is raised very second until the visibility mode is changed to NonDiscoverable.
/// </summary>
+ /// <exception cref="System.NotSupportedException">Thrown when the Bluetooth is not supported.</exception>
+ /// <exception cref="System.InvalidOperationException">Thrown when the Bluetooth is not enabled.</exception>
static public event EventHandler<VisibilityDurationChangedEventArgs> VisibilityDurationChanged
{
add
{
static public event EventHandler<VisibilityDurationChangedEventArgs> VisibilityDurationChanged
{
add
{
- BluetoothAdapterImpl.Instance.VisibilityDurationChanged += value;
+ try
+ {
+ BluetoothAdapterImpl.Instance.VisibilityDurationChanged += value;
+ }
+ catch (TypeInitializationException e)
+ {
+ throw e.InnerException;
+ }
}
remove
{
}
remove
{
- BluetoothAdapterImpl.Instance.VisibilityDurationChanged -= value;
+ try
+ {
+ BluetoothAdapterImpl.Instance.VisibilityDurationChanged -= value;
+ }
+ catch (TypeInitializationException e)
+ {
+ throw e.InnerException;
+ }
}
}
/// <summary>
/// The DiscoveryStateChanged event is raised when the device discovery state is changed.
/// </summary>
}
}
/// <summary>
/// The DiscoveryStateChanged event is raised when the device discovery state is changed.
/// </summary>
+ /// <exception cref="System.NotSupportedException">Thrown when the Bluetooth is not supported.</exception>
+ /// <exception cref="System.InvalidOperationException">Thrown when the Bluetooth is not enabled.</exception>
static public event EventHandler<DiscoveryStateChangedEventArgs> DiscoveryStateChanged
{
add
{
static public event EventHandler<DiscoveryStateChangedEventArgs> DiscoveryStateChanged
{
add
{
- BluetoothAdapterImpl.Instance.DiscoveryStateChanged += value;
+ try
+ {
+ BluetoothAdapterImpl.Instance.DiscoveryStateChanged += value;
+ }
+ catch (TypeInitializationException e)
+ {
+ throw e.InnerException;
+ }
}
remove
{
}
remove
{
- BluetoothAdapterImpl.Instance.DiscoveryStateChanged -= value;
+ try
+ {
+ BluetoothAdapterImpl.Instance.DiscoveryStateChanged -= value;
+ }
+ catch (TypeInitializationException e)
+ {
+ throw e.InnerException;
+ }
}
}
/// <summary>
/// This event is called when the LE scan result is obtained.
/// </summary>
}
}
/// <summary>
/// This event is called when the LE scan result is obtained.
/// </summary>
+ /// <exception cref="System.NotSupportedException">Thrown when the Bluetooth is not supported.</exception>
+ /// <exception cref="System.InvalidOperationException">Thrown when the Bluetooth is not enabled.</exception>
static public event EventHandler<AdapterLeScanResultChangedEventArgs> ScanResultChanged
{
add
{
static public event EventHandler<AdapterLeScanResultChangedEventArgs> ScanResultChanged
{
add
{
- BluetoothLeImplAdapter.Instance.AdapterLeScanResultChanged += value;
+ try
+ {
+ BluetoothLeImplAdapter.Instance.AdapterLeScanResultChanged += value;
+ }
+ catch (TypeInitializationException e)
+ {
+ throw e.InnerException;
+ }
}
}
- remove {
- BluetoothLeImplAdapter.Instance.AdapterLeScanResultChanged -= value;
+ remove
+ {
+ try
+ {
+ BluetoothLeImplAdapter.Instance.AdapterLeScanResultChanged -= value;
+ }
+ catch (TypeInitializationException e)
+ {
+ throw e.InnerException;
+ }
}
}
}
}
@@
-336,7
+447,14
@@
namespace Tizen.Network.Bluetooth
/// <exception cref="System.InvalidOperationException">Thrown when the Bluetooth is not enabled.</exception>
static public bool IsServiceUsed(string serviceUuid)
{
/// <exception cref="System.InvalidOperationException">Thrown when the Bluetooth is not enabled.</exception>
static public bool IsServiceUsed(string serviceUuid)
{
- return BluetoothAdapterImpl.Instance.IsServiceUsed(serviceUuid);
+ try
+ {
+ return BluetoothAdapterImpl.Instance.IsServiceUsed(serviceUuid);
+ }
+ catch (TypeInitializationException e)
+ {
+ throw e.InnerException;
+ }
}
/// <summary>
}
/// <summary>
diff --git
a/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothAdapterImpl.cs
b/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothAdapterImpl.cs
index
444c461
..
14e2981
100644
(file)
--- a/
src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothAdapterImpl.cs
+++ b/
src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothAdapterImpl.cs
@@
-598,7
+598,6
@@
namespace Tizen.Network.Bluetooth
if (ret != (int)BluetoothError.None)
{
Log.Error (Globals.LogTag, "Failed to deinitialize bluetooth, Error - " + (BluetoothError)ret);
if (ret != (int)BluetoothError.None)
{
Log.Error (Globals.LogTag, "Failed to deinitialize bluetooth, Error - " + (BluetoothError)ret);
- BluetoothErrorFactory.ThrowBluetoothException (ret);
}
else
{
}
else
{