From a13b21d994570b42dd469c863c3845aa0c56c91a Mon Sep 17 00:00:00 2001 From: DotnetBuild Date: Thu, 12 Oct 2017 17:08:14 +0900 Subject: [PATCH] Release 4.0.0-preview1-00295 --- packaging/csapi-tizenfx.spec | 4 +- .../Tizen.Applications/WidgetBase.cs | 2 +- .../Tizen.Applications/WidgetControl.cs | 2 +- .../Interop/Interop.ImageInfo.cs | 6 -- .../Interop/Interop.MediaInfo.cs | 11 --- .../Tizen.Content.MediaContent/Columns.cs | 12 --- .../Tizen.Content.MediaContent/ImageInfo.cs | 18 +--- .../Tizen.Content.MediaContent/MediaDatabase.cs | 1 - .../MediaInfoColumnKey.cs | 4 - .../Tizen.Content.MediaContent/MediaInfoCommand.cs | 61 -------------- .../AudioIO/AudioCapture.cs | 3 + .../AudioIO/AudioPlayback.cs | 3 + src/Tizen.Multimedia.Camera/Camera/Camera.cs | 2 +- .../MediaCodec/MediaCodec.cs | 3 + .../MetadataEditor/MetadataEditor.cs | 3 + .../MetadataExtractor/MetadataExtractor.cs | 3 + src/Tizen.Multimedia.Radio/Radio/Radio.cs | 98 +++++++++++----------- .../ScreenMirroring/ScreenMirroring.cs | 3 + .../MediaVision/EngineConfiguration.cs | 3 + .../MediaVision/FaceRecognitionModel.cs | 3 + .../MediaVision/FaceTrackingModel.cs | 3 + .../MediaVision/ImageObject.cs | 3 + .../MediaVision/ImageTrackingModel.cs | 3 + .../MediaVision/MediaVisionSource.cs | 6 ++ .../MediaVision/SurveillanceEngine.cs | 3 + src/Tizen.Multimedia/MediaTool/MediaPacket.cs | 3 + .../Tizen.Network.IoTConnectivity/Attributes.cs | 22 +++-- .../IoTConnectivityClientManager.cs | 30 +++---- .../IoTConnectivityServerManager.cs | 8 +- .../Tizen.Network.IoTConnectivity/LiteResource.cs | 52 ++++++++++-- .../Representation.cs | 12 +-- .../Tizen.Network.IoTConnectivity/Resource.cs | 8 +- .../ResourceInterfaces.cs | 22 ++--- .../ResourceOptions.cs | 28 +++---- .../Tizen.Network.IoTConnectivity/ResourceQuery.cs | 28 +++---- .../Tizen.Network.IoTConnectivity/ResourceTypes.cs | 22 ++--- .../Tizen.Network.Mtp/MtpDevice.cs | 6 ++ .../Tizen.Network.Mtp/MtpErrorFactory.cs | 40 ++++++++- .../Tizen.Network.Mtp/MtpObject.cs | 6 ++ .../Tizen.Network.Mtp/MtpStorage.cs | 6 ++ .../Tizen.Network.Nfc/NfcCardEmulationAdapter.cs | 6 ++ .../Tizen.Network.Nfc/NfcErrorFactory.cs | 72 ++++++++++++++++ .../Tizen.Network.Nfc/NfcNdefMessage.cs | 6 ++ .../Tizen.Network.Nfc/NfcNdefRecord.cs | 8 +- src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcP2p.cs | 12 +++ .../Tizen.Network.Nfc/NfcP2pAdapter.cs | 6 ++ .../Tizen.Network.Nfc/NfcSecureElement.cs | 6 ++ src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcTag.cs | 6 ++ .../Tizen.Network.Nfc/NfcTagAdapter.cs | 6 ++ .../Tizen.Network.Smartcard/SmartcardChannel.cs | 6 ++ .../Tizen.Network.Smartcard/SmartcardReader.cs | 6 ++ .../Tizen.Network.Smartcard/SmartcardSession.cs | 6 ++ .../doc/api/Tizen.Security.TEEC.md | 5 ++ src/Tizen.System.Feedback/Feedback/Feedback.cs | 16 ++++ .../SystemSettingsEventArgs.cs | 60 +++++++++++++ 55 files changed, 517 insertions(+), 266 deletions(-) mode change 100755 => 100644 src/Tizen.Multimedia.Metadata/MetadataEditor/MetadataEditor.cs mode change 100755 => 100644 src/Tizen.Multimedia.Metadata/MetadataExtractor/MetadataExtractor.cs mode change 100755 => 100644 src/Tizen.Multimedia.Remoting/ScreenMirroring/ScreenMirroring.cs mode change 100755 => 100644 src/Tizen.Multimedia.Vision/MediaVision/EngineConfiguration.cs mode change 100755 => 100644 src/Tizen.Multimedia.Vision/MediaVision/FaceRecognitionModel.cs mode change 100755 => 100644 src/Tizen.Multimedia.Vision/MediaVision/FaceTrackingModel.cs mode change 100755 => 100644 src/Tizen.Multimedia.Vision/MediaVision/ImageObject.cs mode change 100755 => 100644 src/Tizen.Multimedia.Vision/MediaVision/ImageTrackingModel.cs mode change 100755 => 100644 src/Tizen.Multimedia.Vision/MediaVision/MediaVisionSource.cs mode change 100755 => 100644 src/Tizen.Multimedia.Vision/MediaVision/SurveillanceEngine.cs diff --git a/packaging/csapi-tizenfx.spec b/packaging/csapi-tizenfx.spec index 020ef7e..2edfc1c 100644 --- a/packaging/csapi-tizenfx.spec +++ b/packaging/csapi-tizenfx.spec @@ -9,7 +9,7 @@ Name: csapi-tizenfx Summary: Assemblies of Tizen .NET -Version: 4.0.0.286 +Version: 4.0.0.295 Release: 1 Group: Development/Libraries License: Apache-2.0 @@ -144,7 +144,7 @@ rm -fr %{_tizenfx_bin_path} export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true ./build.sh --full ./build.sh --dummy -./build.sh --pack 4.0.0-preview1-00286 +./build.sh --pack 4.0.0-preview1-00295 %install mkdir -p %{buildroot}%{DOTNET_ASSEMBLY_PATH} diff --git a/src/Tizen.Applications.WidgetApplication/Tizen.Applications/WidgetBase.cs b/src/Tizen.Applications.WidgetApplication/Tizen.Applications/WidgetBase.cs index 663933f..5aa1872 100755 --- a/src/Tizen.Applications.WidgetApplication/Tizen.Applications/WidgetBase.cs +++ b/src/Tizen.Applications.WidgetApplication/Tizen.Applications/WidgetBase.cs @@ -26,7 +26,7 @@ namespace Tizen.Applications { internal IntPtr Handle; internal string Id; - protected static readonly string LogTag = typeof(WidgetBase).Namespace; + private const string LogTag = "Tizen.Applications.WidgetBase"; /// /// Window object for this widget instance. diff --git a/src/Tizen.Applications.WidgetControl/Tizen.Applications/WidgetControl.cs b/src/Tizen.Applications.WidgetControl/Tizen.Applications/WidgetControl.cs index f8bbc41..c4beb30 100755 --- a/src/Tizen.Applications.WidgetControl/Tizen.Applications/WidgetControl.cs +++ b/src/Tizen.Applications.WidgetControl/Tizen.Applications/WidgetControl.cs @@ -26,7 +26,7 @@ namespace Tizen.Applications /// public class WidgetControl : IDisposable { - protected static readonly string LogTag = "WidgetControl"; + private const string LogTag = "Tizen.Applications.WidgetControl"; /// /// Class for the widget instance. /// diff --git a/src/Tizen.Content.MediaContent/Interop/Interop.ImageInfo.cs b/src/Tizen.Content.MediaContent/Interop/Interop.ImageInfo.cs index c7d5ff8..ce8caf6 100644 --- a/src/Tizen.Content.MediaContent/Interop/Interop.ImageInfo.cs +++ b/src/Tizen.Content.MediaContent/Interop/Interop.ImageInfo.cs @@ -31,9 +31,6 @@ internal static partial class Interop [DllImport(Libraries.MediaContent, EntryPoint = "image_meta_get_date_taken", CallingConvention = CallingConvention.Cdecl)] internal static extern MediaContentError GetDateTaken(IntPtr handle, out IntPtr dateTaken); - [DllImport(Libraries.MediaContent, EntryPoint = "image_meta_get_burst_id", CallingConvention = CallingConvention.Cdecl)] - internal static extern MediaContentError GetBurstId(IntPtr handle, out IntPtr burstId); - [DllImport(Libraries.MediaContent, EntryPoint = "image_meta_get_exposure_time", CallingConvention = CallingConvention.Cdecl)] internal static extern MediaContentError GetExposureTime(IntPtr handle, out IntPtr exposureTime); @@ -46,9 +43,6 @@ internal static partial class Interop [DllImport(Libraries.MediaContent, EntryPoint = "image_meta_get_model", CallingConvention = CallingConvention.Cdecl)] internal static extern MediaContentError GetModel(IntPtr handle, out IntPtr model); - [DllImport(Libraries.MediaContent, EntryPoint = "image_meta_is_burst_shot", CallingConvention = CallingConvention.Cdecl)] - internal static extern MediaContentError IsBurstShot(IntPtr handle, out bool isBurstShot); - [DllImport(Libraries.MediaContent, EntryPoint = "image_meta_get_media_id", CallingConvention = CallingConvention.Cdecl)] internal static extern MediaContentError GetMediaId(IntPtr handle, out IntPtr mediaId); diff --git a/src/Tizen.Content.MediaContent/Interop/Interop.MediaInfo.cs b/src/Tizen.Content.MediaContent/Interop/Interop.MediaInfo.cs index 244e98a..296c9a9 100644 --- a/src/Tizen.Content.MediaContent/Interop/Interop.MediaInfo.cs +++ b/src/Tizen.Content.MediaContent/Interop/Interop.MediaInfo.cs @@ -31,9 +31,6 @@ internal static partial class Interop [UnmanagedFunctionPointer(CallingConvention.Cdecl)] internal delegate void InsertCompletedCallback(MediaContentError error, IntPtr userData); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - internal delegate void InsertBurstShotCompletedCallback(MediaContentError error, IntPtr userData); - [DllImport(Libraries.MediaContent, EntryPoint = "media_info_insert_to_db")] internal static extern MediaContentError Insert(string filePath, out MediaInfoHandle info); @@ -41,16 +38,9 @@ internal static partial class Interop internal static extern MediaContentError BatchInsert(string[] filePathArray, int arrayLength, InsertCompletedCallback callback, IntPtr userData = default(IntPtr)); - [DllImport(Libraries.MediaContent, EntryPoint = "media_info_insert_burst_shot_to_db")] - internal static extern MediaContentError BurstShotInsert(string[] filePathArray, int arrayLength, - InsertBurstShotCompletedCallback callback, IntPtr userData = default(IntPtr)); - [DllImport(Libraries.MediaContent, EntryPoint = "media_info_delete_from_db")] internal static extern MediaContentError Delete(string mediaId); - [DllImport(Libraries.MediaContent, EntryPoint = "media_info_delete_batch_from_db")] - internal static extern MediaContentError BatchDelete(FilterHandle filter); - [DllImport(Libraries.MediaContent, EntryPoint = "media_info_destroy")] internal static extern MediaContentError Destroy(IntPtr handle); @@ -200,7 +190,6 @@ internal static partial class Interop [DllImport(Libraries.MediaContent, EntryPoint = "media_info_cancel_thumbnail")] internal static extern MediaContentError CancelThumbnail(MediaInfoHandle mediaInformationHandle); - [DllImport(Libraries.MediaContent, EntryPoint = "media_info_start_face_detection")] internal static extern MediaContentError StartFaceDetection(MediaInfoHandle handle, FaceDetectionCompletedCallback callback, IntPtr userData = default(IntPtr)); diff --git a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Columns.cs b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Columns.cs index e6050de..135fa38 100644 --- a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Columns.cs +++ b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Columns.cs @@ -390,16 +390,6 @@ namespace Tizen.Content.MediaContent public static string Orientation => "MEDIA_ORIENTATION"; /// - /// Gets the column name for the burst ID of media. - /// - /// The column name for the burst ID of media. - /// - /// The value type is string. - /// - /// - public static string BurstId => "BURST_ID"; - - /// /// Gets the column name for the rating of media. /// /// The column name for the rating of media. @@ -439,7 +429,6 @@ namespace Tizen.Content.MediaContent /// public static string Category => "MEDIA_CATEGORY"; - /// /// Gets the column name for the location tag of media. /// @@ -532,7 +521,6 @@ namespace Tizen.Content.MediaContent public static string Model => "MEDIA_MODEL"; } - /// /// Provides the folder column names that can be used for Select and Count commands. /// diff --git a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ImageInfo.cs b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ImageInfo.cs index 0a60625..8562b23 100644 --- a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ImageInfo.cs +++ b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ImageInfo.cs @@ -40,7 +40,6 @@ namespace Tizen.Content.MediaContent Orientation = InteropHelper.GetValue(imageHandle, Interop.ImageInfo.GetOrientation); DateTaken = InteropHelper.GetString(imageHandle, Interop.ImageInfo.GetDateTaken); - BurstId = InteropHelper.GetString(imageHandle, Interop.ImageInfo.GetBurstId); ExposureTime = InteropHelper.GetString(imageHandle, Interop.ImageInfo.GetExposureTime); FNumber = InteropHelper.GetValue(imageHandle, Interop.ImageInfo.GetFNumber); @@ -48,8 +47,6 @@ namespace Tizen.Content.MediaContent Model = InteropHelper.GetString(imageHandle, Interop.ImageInfo.GetModel); - IsBurstShot = InteropHelper.GetValue(imageHandle, Interop.ImageInfo.IsBurstShot); - } finally { @@ -82,13 +79,6 @@ namespace Tizen.Content.MediaContent public string DateTaken { get; } /// - /// Gets the burst shot ID. - /// - /// The burst shot ID if it is a burst shot, otherwise an empty string. - /// - public string BurstId { get; } - - /// /// Gets the exposure time from EXIF. /// /// The exposure time from EXIF. @@ -97,7 +87,7 @@ namespace Tizen.Content.MediaContent /// /// Gets the FNumber from EXIF. /// - /// The FNumber from exif. + /// The FNumber from EXIF. public double FNumber { get; } /// @@ -111,11 +101,5 @@ namespace Tizen.Content.MediaContent /// /// The model from EXIF. public string Model { get; } - - /// - /// Gets the value indicating whether the media is a burst shot image. - /// - /// true if the media is a burst shot image, otherwise false. - public bool IsBurstShot { get; } } } diff --git a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaDatabase.cs b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaDatabase.cs index 72031a5..b373d7f 100644 --- a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaDatabase.cs +++ b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaDatabase.cs @@ -135,7 +135,6 @@ namespace Tizen.Content.MediaContent } } - private static readonly Interop.Content.MediaContentDBUpdatedCallback _folderUpdatedCb = ( MediaContentError error, int pid, ItemType updateItem, OperationType updateType, MediaType mediaType, string uuid, string filePath, string mimeType, IntPtr _) => diff --git a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfoColumnKey.cs b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfoColumnKey.cs index 12f5364..ff1ba55 100644 --- a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfoColumnKey.cs +++ b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfoColumnKey.cs @@ -98,10 +98,6 @@ namespace Tizen.Content.MediaContent /// Altitude, /// - /// Burst shot. - /// - BurstImage, - /// /// Rating. /// Rating = 20, diff --git a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfoCommand.cs b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfoCommand.cs index f0a5fb3..7850a28 100644 --- a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfoCommand.cs +++ b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfoCommand.cs @@ -109,7 +109,6 @@ namespace Tizen.Content.MediaContent Bookmark.FromHandle); } - /// /// Retrieves the number of the face information added to or detected from the media. /// @@ -252,7 +251,6 @@ namespace Tizen.Content.MediaContent Tag.FromHandle); } - /// /// Retrieves the number of the media information. /// @@ -624,64 +622,6 @@ namespace Tizen.Content.MediaContent } } - /// - /// Adds burst shot images into the media database. - /// - /// The paths of the burst shot images to add. - /// A task that represents the asynchronous add operation. - /// - /// The paths that already exist in the database.\n - /// At most 300 items can be added at once. - /// \n - /// If you want to access internal storage, you should add privilege http://tizen.org/privilege/mediastorage.\n - /// If you want to access external storage, you should add privilege http://tizen.org/privilege/externalstorage. - /// - /// http://tizen.org/privilege/content.write - /// http://tizen.org/privilege/mediastorage - /// http://tizen.org/privilege/externalstorage - /// The is disconnected. - /// The has already been disposed of. - /// An error occurred while executing the command. - /// is null. - /// - /// contains null.\n - /// -or-\n - /// contains the invalid path.\n - /// -or-\n - /// The number of is 300 or more items. - /// - /// contains a path that does not exist. - /// The caller has no required privilege. - public async Task AddBurstShotImagesAsync(IEnumerable paths) - { - ValidateDatabase(); - - ValidatePaths(paths); - - var tcs = new TaskCompletionSource(TaskContinuationOptions.RunContinuationsAsynchronously); - string[] pathArray = paths.ToArray(); - - Interop.MediaInfo.InsertBurstShotCompletedCallback callback = (error, _) => - { - if (error == MediaContentError.None) - { - tcs.TrySetResult(true); - } - else - { - tcs.TrySetException(error.AsException("Failed to add burst shot images")); - } - }; - - using (ObjectKeeper.Get(callback)) - { - Interop.MediaInfo.BurstShotInsert(pathArray, pathArray.Length, callback). - ThrowIfError("Failed to add burst shots to db"); - - await tcs.Task; - } - } - private static void SetUpdateValue(Interop.MediaInfoHandle handle, T value, Func func) { @@ -691,7 +631,6 @@ namespace Tizen.Content.MediaContent } } - private static void SetUpdateValue(Interop.MediaInfoHandle handle, Nullable value, Func func) where T : struct { diff --git a/src/Tizen.Multimedia.AudioIO/AudioIO/AudioCapture.cs b/src/Tizen.Multimedia.AudioIO/AudioIO/AudioCapture.cs index d4eeb15..b4bc86b 100644 --- a/src/Tizen.Multimedia.AudioIO/AudioIO/AudioCapture.cs +++ b/src/Tizen.Multimedia.AudioIO/AudioIO/AudioCapture.cs @@ -63,6 +63,9 @@ namespace Tizen.Multimedia RegisterStateChangedCallback(); } + /// + /// Finalizes an instance of the AudioCaptureBase class. + /// ~AudioCaptureBase() { Dispose(false); diff --git a/src/Tizen.Multimedia.AudioIO/AudioIO/AudioPlayback.cs b/src/Tizen.Multimedia.AudioIO/AudioIO/AudioPlayback.cs index 4a3fdaf..2b37cb6 100644 --- a/src/Tizen.Multimedia.AudioIO/AudioIO/AudioPlayback.cs +++ b/src/Tizen.Multimedia.AudioIO/AudioIO/AudioPlayback.cs @@ -123,6 +123,9 @@ namespace Tizen.Multimedia RegisterStateChangedCallback(); } + /// + /// Finalizes an instance of the AudioPlayback class. + /// ~AudioPlayback() { Dispose(false); diff --git a/src/Tizen.Multimedia.Camera/Camera/Camera.cs b/src/Tizen.Multimedia.Camera/Camera/Camera.cs index 9ac9378..f521f9a 100644 --- a/src/Tizen.Multimedia.Camera/Camera/Camera.cs +++ b/src/Tizen.Multimedia.Camera/Camera/Camera.cs @@ -64,7 +64,7 @@ namespace Tizen.Multimedia } /// - /// Destructor of the camera class. + /// Finalizes an instance of the Camera class. /// ~Camera() { diff --git a/src/Tizen.Multimedia.MediaCodec/MediaCodec/MediaCodec.cs b/src/Tizen.Multimedia.MediaCodec/MediaCodec/MediaCodec.cs index f4b3f1f..6f32997 100644 --- a/src/Tizen.Multimedia.MediaCodec/MediaCodec/MediaCodec.cs +++ b/src/Tizen.Multimedia.MediaCodec/MediaCodec/MediaCodec.cs @@ -73,6 +73,9 @@ namespace Tizen.Multimedia.MediaCodec } } + /// + /// Finalizes an instance of the MediaCodec class. + /// ~MediaCodec() { Dispose(false); diff --git a/src/Tizen.Multimedia.Metadata/MetadataEditor/MetadataEditor.cs b/src/Tizen.Multimedia.Metadata/MetadataEditor/MetadataEditor.cs old mode 100755 new mode 100644 index 54fbaf9..f50ab07 --- a/src/Tizen.Multimedia.Metadata/MetadataEditor/MetadataEditor.cs +++ b/src/Tizen.Multimedia.Metadata/MetadataEditor/MetadataEditor.cs @@ -505,6 +505,9 @@ namespace Tizen.Multimedia Interop.MetadataEditor.RemovePicture(Handle, index).ThrowIfError("Failed to remove picture"); } + /// + /// Finalizes an instance of the MetadataEditor class. + /// ~MetadataEditor() { Dispose(false); diff --git a/src/Tizen.Multimedia.Metadata/MetadataExtractor/MetadataExtractor.cs b/src/Tizen.Multimedia.Metadata/MetadataExtractor/MetadataExtractor.cs old mode 100755 new mode 100644 index 7d9a042..21c9f92 --- a/src/Tizen.Multimedia.Metadata/MetadataExtractor/MetadataExtractor.cs +++ b/src/Tizen.Multimedia.Metadata/MetadataExtractor/MetadataExtractor.cs @@ -268,6 +268,9 @@ namespace Tizen.Multimedia } } + /// + /// Finalizes an instance of the MetadataExtractor class. + /// ~MetadataExtractor() { Dispose(false); diff --git a/src/Tizen.Multimedia.Radio/Radio/Radio.cs b/src/Tizen.Multimedia.Radio/Radio/Radio.cs index 20d70fd..a21450a 100755 --- a/src/Tizen.Multimedia.Radio/Radio/Radio.cs +++ b/src/Tizen.Multimedia.Radio/Radio/Radio.cs @@ -16,6 +16,7 @@ using System; using System.Linq; +using System.Runtime.InteropServices; using System.Threading.Tasks; using Tizen.System; using static Tizen.Multimedia.Interop.Radio; @@ -43,8 +44,13 @@ namespace Tizen.Multimedia try { - SetScanCompletedCb(_handle, ScanCompleteCallback).ThrowIfFailed("Failed to initialize radio"); - SetInterruptedCb(_handle, InterruptedCallback).ThrowIfFailed("Failed to initialize radio"); + _scanCompletedCallback = _ => ScanCompleted?.Invoke(this, EventArgs.Empty); + _interruptedCallback = (reason, _) => Interrupted?.Invoke(this, new RadioInterruptedEventArgs(reason)); + _scanUpdatedCallback = (frequency, _) => ScanUpdated?.Invoke(this, new ScanUpdatedEventArgs(frequency)); + _scanStoppedCallback = _ => ScanStopped?.Invoke(this, EventArgs.Empty); + + SetScanCompletedCb(_handle, _scanCompletedCallback).ThrowIfFailed("Failed to initialize radio"); + SetInterruptedCb(_handle, _interruptedCallback).ThrowIfFailed("Failed to initialize radio"); } catch (Exception) { @@ -65,6 +71,14 @@ namespace Tizen.Multimedia } } + private ScanUpdatedCallback _scanUpdatedCallback; + + private ScanStoppedCallback _scanStoppedCallback; + + private ScanCompletedCallback _scanCompletedCallback; + + private InterruptedCallback _interruptedCallback; + /// /// Occurs when the radio scanning information is updated. /// @@ -252,7 +266,7 @@ namespace Tizen.Multimedia { ValidateRadioState(RadioState.Ready, RadioState.Playing); - ScanStart(Handle, ScanUpdatedCallback); + ScanStart(Handle, _scanUpdatedCallback).ThrowIfFailed("Failed to start scanning"); } /// @@ -265,7 +279,7 @@ namespace Tizen.Multimedia { ValidateRadioState(RadioState.Scanning); - ScanStop(Handle, ScanStoppedCallback); + ScanStop(Handle, _scanStoppedCallback).ThrowIfFailed("Failed to stop scanning"); } /// @@ -277,19 +291,14 @@ namespace Tizen.Multimedia /// It can be -1 if the seeking operation has failed. /// /// The radio must be in the state. - /// The radio is not in the valid state. - public async Task SeekUpAsync() + /// + /// The radio is not in the valid state.\n + /// -or-\n + /// Seeking is in progress. + /// + public Task SeekUpAsync() { - ValidateRadioState(RadioState.Playing); - - TaskCompletionSource tcs = new TaskCompletionSource(); - SeekCompletedCallback callback = (currentFrequency, _) => - { - tcs.TrySetResult(currentFrequency); - }; - - SeekUp(Handle, callback); - return await tcs.Task; + return SeekAsync(SeekUp); } /// @@ -301,53 +310,46 @@ namespace Tizen.Multimedia /// It can be -1 if the seeking operation has failed. /// /// The radio must be in the state. - /// The radio is not in the valid state. - public async Task SeekDownAsync() + /// + /// The radio is not in the valid state.\n + /// -or-\n + /// Seeking is in progress. + /// + public Task SeekDownAsync() + { + return SeekAsync(SeekDown); + } + + private async Task SeekAsync(Func func) { ValidateRadioState(RadioState.Playing); - TaskCompletionSource tcs = new TaskCompletionSource(); - SeekCompletedCallback callback = (currentFrequency, _) => + var tcs = new TaskCompletionSource(); + SeekCompletedCallback callback = (currentFrequency, _) => tcs.TrySetResult(currentFrequency); + + GCHandle gcHandle; + try { - tcs.TrySetResult(currentFrequency); - }; + gcHandle = GCHandle.Alloc(callback); - SeekDown(Handle, callback); - return await tcs.Task; + func(Handle, callback, IntPtr.Zero).ThrowIfFailed("Failed to seek"); + return await tcs.Task; + } + finally + { + gcHandle.Free(); + } } private void ValidateFeatureSupported(string featurePath) { - bool supported = false; - Information.TryGetValue(featurePath, out supported); - - if (supported == false) + if (Information.TryGetValue(featurePath, out bool supported) == false || supported == false) { throw new NotSupportedException($"The feature({featurePath}) is not supported."); } } - private void ScanUpdatedCallback(int frequency, IntPtr data) - { - ScanUpdated?.Invoke(this, new ScanUpdatedEventArgs(frequency)); - } - - private void ScanStoppedCallback(IntPtr data) - { - ScanStopped?.Invoke(this, EventArgs.Empty); - } - - private void ScanCompleteCallback(IntPtr data) - { - ScanCompleted?.Invoke(this, EventArgs.Empty); - } - - private void InterruptedCallback(RadioInterruptedReason reason, IntPtr data) - { - Interrupted?.Invoke(this, new RadioInterruptedEventArgs(reason)); - } - private void ValidateRadioState(params RadioState[] required) { RadioState curState = State; diff --git a/src/Tizen.Multimedia.Remoting/ScreenMirroring/ScreenMirroring.cs b/src/Tizen.Multimedia.Remoting/ScreenMirroring/ScreenMirroring.cs old mode 100755 new mode 100644 index 7badfec..824cd68 --- a/src/Tizen.Multimedia.Remoting/ScreenMirroring/ScreenMirroring.cs +++ b/src/Tizen.Multimedia.Remoting/ScreenMirroring/ScreenMirroring.cs @@ -75,6 +75,9 @@ namespace Tizen.Multimedia.Remoting RegisterStateChangedEvent(); } + /// + /// Finalizes an instance of the ScreenMirroring class. + /// ~ScreenMirroring() { Dispose(false); diff --git a/src/Tizen.Multimedia.Vision/MediaVision/EngineConfiguration.cs b/src/Tizen.Multimedia.Vision/MediaVision/EngineConfiguration.cs old mode 100755 new mode 100644 index aa20741..d2e12be --- a/src/Tizen.Multimedia.Vision/MediaVision/EngineConfiguration.cs +++ b/src/Tizen.Multimedia.Vision/MediaVision/EngineConfiguration.cs @@ -69,6 +69,9 @@ namespace Tizen.Multimedia.Vision EngineConfig.Create(out _handle).Validate("Failed to create media vision engine."); } + /// + /// Finalizes an instance of the EngineConfiguration class. + /// ~EngineConfiguration() { Dispose(false); diff --git a/src/Tizen.Multimedia.Vision/MediaVision/FaceRecognitionModel.cs b/src/Tizen.Multimedia.Vision/MediaVision/FaceRecognitionModel.cs old mode 100755 new mode 100644 index 20b727b..e9f95b7 --- a/src/Tizen.Multimedia.Vision/MediaVision/FaceRecognitionModel.cs +++ b/src/Tizen.Multimedia.Vision/MediaVision/FaceRecognitionModel.cs @@ -68,6 +68,9 @@ namespace Tizen.Multimedia.Vision Validate("Failed to load FaceRecognitionModel from file"); } + /// + /// Finalizes an instance of the FaceRecognitionModel class. + /// ~FaceRecognitionModel() { Dispose(false); diff --git a/src/Tizen.Multimedia.Vision/MediaVision/FaceTrackingModel.cs b/src/Tizen.Multimedia.Vision/MediaVision/FaceTrackingModel.cs old mode 100755 new mode 100644 index 6653921..01ff2a6 --- a/src/Tizen.Multimedia.Vision/MediaVision/FaceTrackingModel.cs +++ b/src/Tizen.Multimedia.Vision/MediaVision/FaceTrackingModel.cs @@ -65,6 +65,9 @@ namespace Tizen.Multimedia.Vision InteropModel.Load(modelPath, out _handle).Validate("Failed to load FaceTrackingModel from file."); } + /// + /// Finalizes an instance of the FaceTrackingModel class. + /// ~FaceTrackingModel() { Dispose(false); diff --git a/src/Tizen.Multimedia.Vision/MediaVision/ImageObject.cs b/src/Tizen.Multimedia.Vision/MediaVision/ImageObject.cs old mode 100755 new mode 100644 index ab0b6d9..0b4c71b --- a/src/Tizen.Multimedia.Vision/MediaVision/ImageObject.cs +++ b/src/Tizen.Multimedia.Vision/MediaVision/ImageObject.cs @@ -65,6 +65,9 @@ namespace Tizen.Multimedia.Vision InteropImage.Load(path, out _handle).Validate("Failed to load image object from file"); } + /// + /// Finalizes an instance of the ImageObject class. + /// ~ImageObject() { Dispose(false); diff --git a/src/Tizen.Multimedia.Vision/MediaVision/ImageTrackingModel.cs b/src/Tizen.Multimedia.Vision/MediaVision/ImageTrackingModel.cs old mode 100755 new mode 100644 index a3b9bec..fd509f9 --- a/src/Tizen.Multimedia.Vision/MediaVision/ImageTrackingModel.cs +++ b/src/Tizen.Multimedia.Vision/MediaVision/ImageTrackingModel.cs @@ -65,6 +65,9 @@ namespace Tizen.Multimedia.Vision InteropModel.Load(modelPath, out _handle).Validate("Failed to load ImageTrackingModel from file"); } + /// + /// Finalizes an instance of the ImageTrackingModel class. + /// ~ImageTrackingModel() { Dispose(false); diff --git a/src/Tizen.Multimedia.Vision/MediaVision/MediaVisionSource.cs b/src/Tizen.Multimedia.Vision/MediaVision/MediaVisionSource.cs old mode 100755 new mode 100644 index 25a66d6..c3c663a --- a/src/Tizen.Multimedia.Vision/MediaVision/MediaVisionSource.cs +++ b/src/Tizen.Multimedia.Vision/MediaVision/MediaVisionSource.cs @@ -121,6 +121,9 @@ namespace Tizen.Multimedia.Vision { } + /// + /// Finalizes an instance of the MediaVisionSource class. + /// ~MediaVisionSource() { Dispose(false); @@ -223,6 +226,9 @@ namespace Tizen.Multimedia.Vision } } + /// + /// Releases all resources used by the current instance. + /// public void Dispose() { Dispose(true); diff --git a/src/Tizen.Multimedia.Vision/MediaVision/SurveillanceEngine.cs b/src/Tizen.Multimedia.Vision/MediaVision/SurveillanceEngine.cs old mode 100755 new mode 100644 index b3921a4..6b845b3 --- a/src/Tizen.Multimedia.Vision/MediaVision/SurveillanceEngine.cs +++ b/src/Tizen.Multimedia.Vision/MediaVision/SurveillanceEngine.cs @@ -42,6 +42,9 @@ namespace Tizen.Multimedia.Vision EventTriggerCreate(eventType, out _handle).Validate("Failed to create surveillance event trigger."); } + /// + /// Finalizes an instance of the SurveillanceEngine class. + /// ~SurveillanceEngine() { Dispose(false); diff --git a/src/Tizen.Multimedia/MediaTool/MediaPacket.cs b/src/Tizen.Multimedia/MediaTool/MediaPacket.cs index 64e6d59..d8f3f30 100644 --- a/src/Tizen.Multimedia/MediaTool/MediaPacket.cs +++ b/src/Tizen.Multimedia/MediaTool/MediaPacket.cs @@ -81,6 +81,9 @@ namespace Tizen.Multimedia } } + /// + /// Finalizes an instance of the MediaPacket class. + /// ~MediaPacket() { Dispose(false); diff --git a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/Attributes.cs b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/Attributes.cs index 6dd18a8..67a1248 100755 --- a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/Attributes.cs +++ b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/Attributes.cs @@ -1,5 +1,3 @@ -/// Copyright 2016 by Samsung Electronics, Inc., -/// /* * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved * @@ -192,10 +190,10 @@ namespace Tizen.Network.IoTConnectivity /// 3 /// The key value pair to add. /// http://tizen.org/feature/iot.ocf - /// + /// ("state", "ON")); - /// + /// ]]> public void Add(KeyValuePair item) { Add(item.Key, item.Value); @@ -326,14 +324,14 @@ namespace Tizen.Network.IoTConnectivity /// 3 /// The status key value pair. /// true if exists. Otherwise, false. - /// + /// ("dim", 10)) /// Console.WriteLine("Attribute conatins pair ('dim', 10)"); - /// + /// ]]> public bool Contains(KeyValuePair item) { return _attributes.Contains(item); @@ -364,7 +362,7 @@ namespace Tizen.Network.IoTConnectivity /// 3 /// The destination array. /// The zero-based index in an array at which copying begins. - /// + /// + /// ]]> public void CopyTo(KeyValuePair[] array, int arrayIndex) { _attributes.CopyTo(array, arrayIndex); @@ -384,7 +382,7 @@ namespace Tizen.Network.IoTConnectivity /// /// 3 /// An enumerator that can be used to iterate through the collection. - /// + /// + /// ]]> public IEnumerator> GetEnumerator() { return _attributes.GetEnumerator(); @@ -409,14 +407,14 @@ namespace Tizen.Network.IoTConnectivity /// Thrown when the iotcon is not supported /// Thrown when there is an invalid parameter /// Thrown when the operation is invalid - /// + /// ("dim", 10))) /// Console.WriteLine("Remove was successful"); - /// + /// ]]> public bool Remove(KeyValuePair item) { return Remove(item.Key); diff --git a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/IoTConnectivityClientManager.cs b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/IoTConnectivityClientManager.cs index 7a8e7ed..e7d1486 100755 --- a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/IoTConnectivityClientManager.cs +++ b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/IoTConnectivityClientManager.cs @@ -281,16 +281,16 @@ namespace Tizen.Network.IoTConnectivity /// When the resource receive presence, event handler will be invoked.\n /// You must destroy presence by calling StopReceivingPresence() if presence event is no longer needed. /// - /// + /// /// - /// + /// /// /// Thrown when the iotcon is not supported. /// Thrown when there is an invalid parameter. /// Thrown when the operation is invalid. /// Thrown when an application does not have privilege to access. /// Thrown when there is not enough memory. - /// + /// handler = (sender, e) => { /// Console.Log("PresenceReceived, presence id :" + e.PresenceId); /// } @@ -301,7 +301,7 @@ namespace Tizen.Network.IoTConnectivity /// IoTConnectivityClientManager.FindingErrorOccurred += errorHandler; /// // Do not forget to remove these event handlers when they are not required any more. /// int id = IoTConnectivityClientManager.StartReceivingPresence(IoTConnectivityClientManager.MulticastAddress, "oic.iot.door"); - /// + /// ]]> public static int StartReceivingPresence(string hostAddress, string resourceType) { Interop.IoTConnectivity.Client.RemoteResource.ConnectivityType connectivityType = Interop.IoTConnectivity.Client.RemoteResource.ConnectivityType.Ip; @@ -380,16 +380,16 @@ namespace Tizen.Network.IoTConnectivity ///
         /// Initialize() should be called to initialize.
         /// 
- /// + /// /// - /// + /// /// /// Thrown when the iotcon is not supported. /// Thrown when there is an invalid parameter. /// Thrown when the operation is invalid. /// Thrown when an application does not have privilege to access. /// Thrown when there is not enough memory. - /// + /// handler = (sender, e) => { /// Console.Log("PresenceReceived, presence id :" + e.PresenceId); /// } @@ -404,7 +404,7 @@ namespace Tizen.Network.IoTConnectivity /// IoTConnectivityClientManager.PresenceReceived -= handler; /// IoTConnectivityClientManager.FindingErrorOccurred -= errorHandler; /// IoTConnectivityClientManager.StopReceivingPresence(id); - /// + /// ]]> public static void StopReceivingPresence(int presenceId) { if (!s_presenceHandlesMap.ContainsKey((IntPtr)presenceId)) @@ -468,7 +468,7 @@ namespace Tizen.Network.IoTConnectivity /// Thrown when the operation is invalid. /// Thrown when an application does not have privilege to access. /// Thrown when there is not enough memory. - /// + /// handler = (sender, e) => { /// Console.Log("Found resource at host address :" + e.Resource.HostAddress + ", uri :" + e.Resource.UriPath); /// } @@ -481,7 +481,7 @@ namespace Tizen.Network.IoTConnectivity /// query.Type = "oic.iot.door"; /// // Do not forget to remove these event handlers when they are not required any more. /// int id = IoTConnectivityClientManager.StartFindingResource(null, query); - /// + /// ]]> public static int StartFindingResource(string hostAddress, ResourceQuery query = null) { Interop.IoTConnectivity.Client.RemoteResource.ConnectivityType connectivityType = Interop.IoTConnectivity.Client.RemoteResource.ConnectivityType.Ip; @@ -573,7 +573,7 @@ namespace Tizen.Network.IoTConnectivity /// /// event handler will be invoked. /// - /// + /// /// /// /// @@ -581,7 +581,7 @@ namespace Tizen.Network.IoTConnectivity /// Thrown when the operation is invalid. /// Thrown when an application does not have privilege to access. /// Thrown when there is not enough memory. - /// + /// handler = (sender, e) => { /// Console.Log("Device information found, id : " + e.RequestId + ", name : " + e.Name); /// } @@ -592,7 +592,7 @@ namespace Tizen.Network.IoTConnectivity /// IoTConnectivityClientManager.FindingErrorOccurred += errorHandler; /// // Do not forget to remove these event handlers when they are not required any more. /// int id = IoTConnectivityClientManager.StartFindingDeviceInformation(IoTConnectivityClientManager.MulticastAddress); - /// + /// ]]> public static int StartFindingDeviceInformation(string hostAddress, ResourceQuery query = null) { Interop.IoTConnectivity.Client.RemoteResource.ConnectivityType connectivityType = Interop.IoTConnectivity.Client.RemoteResource.ConnectivityType.Ip; @@ -683,7 +683,7 @@ namespace Tizen.Network.IoTConnectivity /// Thrown when the operation is invalid. /// Thrown when an application does not have privilege to access. /// Thrown when there is not enough memory. - /// + /// handler = (sender, e) => { /// Console.Log("PlatformInformationFound :" + e.RequestId); /// } @@ -694,7 +694,7 @@ namespace Tizen.Network.IoTConnectivity /// IoTConnectivityClientManager.FindingErrorOccurred += errorHandler; /// // Do not forget to remove these event handlers when they are not required any more. /// int id = IoTConnectivityClientManager.StartFindingPlatformInformation(IoTConnectivityClientManager.MulticastAddress); - /// + /// ]]> public static int StartFindingPlatformInformation(string hostAddress, ResourceQuery query = null) { Interop.IoTConnectivity.Client.RemoteResource.ConnectivityType connectivityType = Interop.IoTConnectivity.Client.RemoteResource.ConnectivityType.Ip; diff --git a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/IoTConnectivityServerManager.cs b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/IoTConnectivityServerManager.cs index 34946c9..c93c532 100755 --- a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/IoTConnectivityServerManager.cs +++ b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/IoTConnectivityServerManager.cs @@ -109,7 +109,7 @@ namespace Tizen.Network.IoTConnectivity /// Thrown when the operation is invalid. /// Thrown when there is not enough memory. /// Thrown when an application does not have privilege to access. - /// + /// (){ "org.tizen.light" }); /// Attributes attributes = new Attributes { { "state", "ON" }}; /// Resource res = new LiteResource("/room/1", types, ResourcePolicy.Discoverable, attributes); @@ -118,7 +118,7 @@ namespace Tizen.Network.IoTConnectivity /// } catch(Exception ex) { /// Console.Log("Exception caught : " + ex.Message); /// } - /// + /// ]]> public static void RegisterResource(Resource resource) { Log.Info(IoTConnectivityErrorFactory.LogTag, "..."); @@ -178,7 +178,7 @@ namespace Tizen.Network.IoTConnectivity /// /// Thrown when the iotcon is not supported. /// Thrown when an application does not have privilege to access. - /// + /// (){ "org.tizen.light" }); /// Attributes attributes = new Attributes { { "state", "ON" }}; /// Resource res = new LiteResource("/room/1", types, ResourcePolicy.Discoverable, attributes); @@ -188,7 +188,7 @@ namespace Tizen.Network.IoTConnectivity /// } catch(Exception ex) { /// Console.Log("Exception caught : " + ex.Message); /// } - /// + /// ]]> public static void UnregisterResource(Resource resource) { if (resource != null) diff --git a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/LiteResource.cs b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/LiteResource.cs index b7b4801..a69e2ae 100755 --- a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/LiteResource.cs +++ b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/LiteResource.cs @@ -14,6 +14,8 @@ * limitations under the License. */ +using System; +using System.ComponentModel; namespace Tizen.Network.IoTConnectivity { @@ -30,7 +32,7 @@ namespace Tizen.Network.IoTConnectivity ///
/// 3 /// - /// Creates a lite resource, which can then be registered in server using .\n + /// Creates a lite resource, which can then be registered in server using .\n /// When client requests some operations, it sends a response to client automatically.\n /// @a uri length must be less than 128. /// @@ -49,13 +51,13 @@ namespace Tizen.Network.IoTConnectivity /// /// /// - /// + /// list = new List() { "org.tizen.light" }; /// Attributes attributes = new Attributes() { /// { "state", "ON" } /// }; /// LiteResource res = new LiteResource("/light/1", new ResourceTypes(list), ResourcePolicy.Discoverable, attributes); - /// + /// ]]> public LiteResource(string uri, ResourceTypes types, ResourcePolicy policy, Attributes attribs = null) : base(uri, types, new ResourceInterfaces(new string[] { ResourceInterfaces.DefaultInterface }), policy) { @@ -67,7 +69,7 @@ namespace Tizen.Network.IoTConnectivity ///
/// 3 /// The attributes of the lite resource. - /// + /// list = new List() { "org.tizen.light" }; /// LiteResource res = new LiteResource("/light/1", new ResourceTypes(list), ResourcePolicy.Discoverable); /// Attributes attributes = new Attributes() { @@ -78,7 +80,7 @@ namespace Tizen.Network.IoTConnectivity /// { /// Console.WriteLine("key : {0}, value : {1}", pair.Key, pair.Value); /// } - /// + /// ]]> public Attributes Attributes { get; set; } /// @@ -108,8 +110,13 @@ namespace Tizen.Network.IoTConnectivity return true; } - // The code block untill @endcond should not appear in doxygen spec. - /// @cond + /// + /// This is called when the client performs get operation on this resource. + /// + /// 3 + /// A request from client. + /// A response having the representation and the result. + [EditorBrowsable(EditorBrowsableState.Never)] protected sealed override Response OnGet(Request request) { Representation representation = new Representation() @@ -129,6 +136,13 @@ namespace Tizen.Network.IoTConnectivity return response; } + /// + /// This is called when the client performs put operation on this resource. + /// + /// 3 + /// A request from client. + /// A response. + [EditorBrowsable(EditorBrowsableState.Never)] protected sealed override Response OnPut(Request request) { Response response = new Response(); @@ -136,6 +150,13 @@ namespace Tizen.Network.IoTConnectivity return response; } + /// + /// This is called when the client performs post operation on this resource. + /// + /// 3 + /// A request from client. + /// A response having the representation and the result. + [EditorBrowsable(EditorBrowsableState.Never)] protected sealed override Response OnPost(Request request) { if (OnPost(request.Representation.Attributes)) @@ -163,6 +184,13 @@ namespace Tizen.Network.IoTConnectivity }; } + /// + /// This is called when the client performs delete operation on this resource. + /// + /// 3 + /// A request from client. + /// A response. + [EditorBrowsable(EditorBrowsableState.Never)] protected sealed override Response OnDelete(Request request) { Response response = new Response(); @@ -170,10 +198,18 @@ namespace Tizen.Network.IoTConnectivity return response; } + /// + /// Called on the observing event. + /// + /// 3 + /// A request from client. + /// Observer type. + /// Observe identifier. + /// Returns true. + [EditorBrowsable(EditorBrowsableState.Never)] protected sealed override bool OnObserving(Request request, ObserveType observeType, int observeId) { return true; } - /// @endcond } } diff --git a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/Representation.cs b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/Representation.cs index 8281a55..0e60112 100755 --- a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/Representation.cs +++ b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/Representation.cs @@ -133,7 +133,7 @@ namespace Tizen.Network.IoTConnectivity /// Thrown when the iotcon is not supported. /// Thrown when there is an invalid parameter. /// Thrown when the operation is invalid. - /// + /// (){ "org.tizen.light" }); /// repr.Type = types; @@ -142,7 +142,7 @@ namespace Tizen.Network.IoTConnectivity /// { /// Console.WriteLine("Type is {0}", item); /// } - /// + /// ]]> public ResourceTypes Type { get @@ -178,7 +178,7 @@ namespace Tizen.Network.IoTConnectivity /// Thrown when the iotcon is not supported. /// Thrown when there is an invalid parameter. /// Thrown when the operation is invalid. - /// + /// (){ ResourceInterfaces.DefaultInterface }); /// repr.Interface = ifaces; @@ -187,7 +187,7 @@ namespace Tizen.Network.IoTConnectivity /// { /// Console.WriteLine("Interface is {0}", iface); /// } - /// + /// ]]> public ResourceInterfaces Interface { get @@ -268,7 +268,7 @@ namespace Tizen.Network.IoTConnectivity /// /// 3 /// List of Child resource representation. - /// + /// () { "org.tizen.light" }); @@ -284,7 +284,7 @@ namespace Tizen.Network.IoTConnectivity /// { /// Console.WriteLine("Exception caught : " + ex.Message); /// } - /// + /// ]]> public ICollection Children { get diff --git a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/Resource.cs b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/Resource.cs index deb277c..e3a4535 100755 --- a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/Resource.cs +++ b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/Resource.cs @@ -59,7 +59,7 @@ namespace Tizen.Network.IoTConnectivity /// /// Thrown when the iotcon is not supported. /// Thrown when there is not enough memory. - /// + /// (){ ResourceInterfaces.DefaultInterface }); /// ResourceTypes types = new ResourceTypes(new List(){ "oic.iot.door.new" }); /// Resource resource = new DoorResource("/door/uri1", types, ifaces, ResourcePolicy.Discoverable | ResourcePolicy.Observable); - /// + /// ]]> protected Resource(string uri, ResourceTypes types, ResourceInterfaces interfaces, ResourcePolicy policy) { UriPath = uri; @@ -177,7 +177,7 @@ namespace Tizen.Network.IoTConnectivity /// Thrown when the iotcon is not supported. /// Thrown when an application does not have privilege to access. /// Thrown when the operation is invalid. - /// + /// (){ ResourceInterfaces.DefaultInterface }); /// ResourceTypes types = new ResourceTypes(new List(){ "oic.iot.door.new.notify" }); /// Resource resource = new DoorResource("/door/uri/new/notify", types, ifaces, ResourcePolicy.Discoverable | ResourcePolicy.Observable); @@ -190,7 +190,7 @@ namespace Tizen.Network.IoTConnectivity /// _attribute, 1 } /// }; /// resource.Notify(repr, QualityOfService.High); - /// + /// ]]> public void Notify(Representation representation, QualityOfService qos) { int ret = (int)IoTConnectivityError.None; diff --git a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/ResourceInterfaces.cs b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/ResourceInterfaces.cs index 49a928b..8947003 100755 --- a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/ResourceInterfaces.cs +++ b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/ResourceInterfaces.cs @@ -95,10 +95,10 @@ namespace Tizen.Network.IoTConnectivity /// Thrown when the iotcon is not supported. /// Thrown when there is not enough memory. /// Thrown when there is an invalid parameter. - /// + /// () /// { ResourceInterfaces.LinkInterface, ResourceInterfaces.ReadonlyInterface }); - /// + /// ]]> public ResourceInterfaces(IEnumerable ifaces) { int ret = Interop.IoTConnectivity.Common.ResourceInterfaces.Create(out _resourceInterfacesHandle); @@ -157,11 +157,11 @@ namespace Tizen.Network.IoTConnectivity /// /// 3 /// Count of interfaces in the list. - /// + /// () /// { ResourceInterfaces.LinkInterface, ResourceInterfaces.ReadonlyInterface }); /// Console.WriteLine("There are {0} interfaces", resourceInterfaces.Count); - /// + /// ]]> public int Count { get @@ -212,14 +212,14 @@ namespace Tizen.Network.IoTConnectivity /// 3 /// The string data to delete from the resource ifaces. /// http://tizen.org/feature/iot.ocf - /// + /// /// Thrown when the iotcon is not supported. /// Thrown when there is an invalid parameter. /// Thrown when the operation is invalid. - /// + /// (){ ResourceInterfaces.BatchInterface }); /// resourceInterfaces.Add(ResourceInterfaces.BatchInterface); - /// + /// ]]> public void Remove(string item) { bool isRemoved = _resourceInterfaces.Remove(item); @@ -241,14 +241,14 @@ namespace Tizen.Network.IoTConnectivity /// /// 3 /// The enumerator. - /// + /// () /// { ResourceInterfaces.LinkInterface, ResourceInterfaces.ReadonlyInterface }); /// foreach(string item in resourceInterfaces) /// { /// Console.WriteLine("Interface : {0}", item); /// } - /// + /// ]]> public IEnumerator GetEnumerator() { return _resourceInterfaces.GetEnumerator(); @@ -259,14 +259,14 @@ namespace Tizen.Network.IoTConnectivity /// /// 3 /// The enumerator. - /// + /// () /// { ResourceInterfaces.LinkInterface, ResourceInterfaces.ReadonlyInterface }); /// foreach(string item in resourceInterfaces) /// { /// Console.WriteLine("Interface : {0}", item); /// } - /// + /// ]]> IEnumerator IEnumerable.GetEnumerator() { return _resourceInterfaces.GetEnumerator(); diff --git a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/ResourceOptions.cs b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/ResourceOptions.cs index 736291e..f3353c1 100755 --- a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/ResourceOptions.cs +++ b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/ResourceOptions.cs @@ -306,11 +306,11 @@ namespace Tizen.Network.IoTConnectivity /// 3 /// The key value pair. /// http://tizen.org/feature/iot.ocf - /// - /// + /// + /// (2050, "12345")); - /// + /// ]]> public void Add(KeyValuePair item) { Add(item.Key, item.Value); @@ -348,13 +348,13 @@ namespace Tizen.Network.IoTConnectivity /// 3 /// The key value pair. /// True if exists. Otherwise, false. - /// + /// (2050, "12345")); /// var isPresent = options.Contains(new KeyValuePair(2050, "12345")); /// if (isPresent) /// Console.WriteLine("Key value pair is present"); - /// + /// ]]> public bool Contains(KeyValuePair item) { return _options.Contains(item); @@ -366,13 +366,13 @@ namespace Tizen.Network.IoTConnectivity /// 3 /// The destination array. /// Index parameter. - /// + /// (2050, "12345")); /// KeyValuePair[] dest = new KeyValuePair[options.Count]; /// options.CopyTo(dest, 0); /// Console.WriteLine("Dest conatins ({0}, {1})", dest[0].Key, dest[0].Value); - /// + /// ]]> public void CopyTo(KeyValuePair[] array, int arrayIndex) { _options.CopyTo(array, arrayIndex); @@ -385,13 +385,13 @@ namespace Tizen.Network.IoTConnectivity /// The key value pair to remove /// True if operation is successful. Otherwise, false /// http://tizen.org/feature/iot.ocf - /// + /// /// Thrown when there is an invalid parameter - /// + /// (2050, "12345")); /// var result = options.Remove(new KeyValuePair(2050, "12345")); - /// + /// ]]> public bool Remove(KeyValuePair item) { return Remove(item.Key); @@ -402,7 +402,7 @@ namespace Tizen.Network.IoTConnectivity /// /// 3 /// Enumerator to option pairs. - /// + /// (2050, "sample1")); /// options.Add(new KeyValuePair(2055, "sample2")); @@ -410,7 +410,7 @@ namespace Tizen.Network.IoTConnectivity /// { /// Console.WriteLine("key : {0}, value : {1}", pair.Key, pair.Value); /// } - /// + /// ]]> public IEnumerator> GetEnumerator() { return _options.GetEnumerator(); @@ -432,7 +432,7 @@ namespace Tizen.Network.IoTConnectivity /// /// 3 /// Enumerator to option pairs. - /// + /// (2050, "sample1")); /// options.Add(new KeyValuePair(2055, "sample2")); @@ -440,7 +440,7 @@ namespace Tizen.Network.IoTConnectivity /// { /// Console.WriteLine("key : {0}, value : {1}", pair.Key, pair.Value); /// } - /// + /// ]]> IEnumerator IEnumerable.GetEnumerator() { return _options.GetEnumerator(); diff --git a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/ResourceQuery.cs b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/ResourceQuery.cs index 7622ee0..1f1a478 100755 --- a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/ResourceQuery.cs +++ b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/ResourceQuery.cs @@ -381,11 +381,11 @@ namespace Tizen.Network.IoTConnectivity /// 3 /// The key value pair. /// http://tizen.org/feature/iot.ocf - /// - /// + /// + /// ("key1", "value1")); - /// + /// ]]> public void Add(KeyValuePair item) { Add(item.Key, item.Value); @@ -424,13 +424,13 @@ namespace Tizen.Network.IoTConnectivity /// 3 /// The key value pair. /// True if exists. Otherwise, false. - /// + /// ("key1", "value1")); /// var isPresent = query.Contains(new KeyValuePair("key1", "value1")); /// if (isPresent) /// Console.WriteLine("Key value pair is present"); - /// + /// ]]> public bool Contains(KeyValuePair item) { return _query.Contains(item); @@ -442,13 +442,13 @@ namespace Tizen.Network.IoTConnectivity /// 3 /// The destination array. /// Index parameter. - /// + /// ("key1", "value1")); /// KeyValuePair[] dest = new KeyValuePair[query.Count]; /// query.CopyTo(dest, 0); /// Console.WriteLine("Dest conatins ({0}, {1})", dest[0].Key, dest[0].Value); - /// + /// ]]> public void CopyTo(KeyValuePair[] array, int arrayIndex) { _query.CopyTo(array, arrayIndex); @@ -461,13 +461,13 @@ namespace Tizen.Network.IoTConnectivity /// The key value pair to remove. /// True if operation is successful. Otherwise, false. /// http://tizen.org/feature/iot.ocf - /// + /// /// Thrown when there is an invalid parameter. - /// + /// ("key1", "value1")); /// var result = query.Remove(new KeyValuePair("key1", "value1")); - /// + /// ]]> public bool Remove(KeyValuePair item) { return Remove(item.Key); @@ -478,7 +478,7 @@ namespace Tizen.Network.IoTConnectivity /// /// 3 /// Enumerator to query pairs. - /// + /// ("key1", "value1")); /// query.Add(new KeyValuePair("key2", "value2")); @@ -486,7 +486,7 @@ namespace Tizen.Network.IoTConnectivity /// { /// Console.WriteLine("key : {0}, value : {1}", pair.Key, pair.Value); /// } - /// + /// ]]> public IEnumerator> GetEnumerator() { return _query.GetEnumerator(); @@ -497,7 +497,7 @@ namespace Tizen.Network.IoTConnectivity /// /// 3 /// The enumerator to the query pairs. - /// + /// ("key1", "value1")); /// query.Add(new KeyValuePair("key2", "value2")); @@ -505,7 +505,7 @@ namespace Tizen.Network.IoTConnectivity /// { /// Console.WriteLine("key : {0}, value : {1}", pair.Key, pair.Value); /// } - /// + /// ]]> IEnumerator IEnumerable.GetEnumerator() { return _query.GetEnumerator(); diff --git a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/ResourceTypes.cs b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/ResourceTypes.cs index 8f91afb..4205bde 100755 --- a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/ResourceTypes.cs +++ b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/ResourceTypes.cs @@ -63,9 +63,9 @@ namespace Tizen.Network.IoTConnectivity /// List of resource types. /// http://tizen.org/feature/iot.ocf /// Thrown when there is an invalid parameter. - /// + /// () { "org.tizen.light", "oic.if.room" }); - /// + /// ]]> public ResourceTypes(IEnumerable types) { int ret = Interop.IoTConnectivity.Common.ResourceTypes.Create(out _resourceTypeHandle); @@ -117,10 +117,10 @@ namespace Tizen.Network.IoTConnectivity /// /// 3 /// Count of types in the list. - /// + /// () { "org.tizen.light", "oic.if.room" }); /// Console.WriteLine("There are {0} items", types.Count); - /// + /// ]]> public int Count { get @@ -174,14 +174,14 @@ namespace Tizen.Network.IoTConnectivity /// 3 /// The string data to delete from the resource types. /// http://tizen.org/feature/iot.ocf - /// + /// /// Thrown when the iotcon is not supported. /// Thrown when there is an invalid parameter. /// Thrown when the operation is invalid. - /// + /// () { "org.tizen.light", "oic.if.room" }); /// resourceTypes.Remove("oic.if.room"); - /// + /// ]]> public void Remove(string item) { int ret = Interop.IoTConnectivity.Common.ResourceTypes.Remove(_resourceTypeHandle, item); @@ -199,13 +199,13 @@ namespace Tizen.Network.IoTConnectivity /// /// 3 /// The enumerator. - /// + /// () { "org.tizen.light", "oic.if.room" }); /// foreach(string item in resourceTypes) /// { /// Console.WriteLine("Type : {0}", item); /// } - /// + /// ]]> public IEnumerator GetEnumerator() { return _resourceTypes.GetEnumerator(); @@ -216,13 +216,13 @@ namespace Tizen.Network.IoTConnectivity /// /// 3 /// The enumerator. - /// + /// () { "org.tizen.light", "oic.if.room" }); /// foreach(string item in resourceTypes) /// { /// Console.WriteLine("Type : {0}", item); /// } - /// + /// ]]> IEnumerator IEnumerable.GetEnumerator() { return _resourceTypes.GetEnumerator(); diff --git a/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpDevice.cs b/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpDevice.cs index 7780694..ab2430a 100644 --- a/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpDevice.cs +++ b/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpDevice.cs @@ -115,11 +115,17 @@ namespace Tizen.Network.Mtp _deviceHandle = handle; } + /// + /// MtpDevice destructor. + /// ~MtpDevice() { Dispose(false); } + /// + /// Dispose + /// public void Dispose() { Dispose(true); diff --git a/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpErrorFactory.cs b/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpErrorFactory.cs index 5362b1e..06d318b 100644 --- a/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpErrorFactory.cs +++ b/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpErrorFactory.cs @@ -30,19 +30,57 @@ namespace Tizen.Network.Mtp /// 5 public enum MtpError { + /// + /// Successful. + /// None = ErrorCode.None, + /// + /// I/O Error. + /// IoError = ErrorCode.IoError, + /// + /// Invalid Parameter. + /// InvalidParameterError = ErrorCode.InvalidParameter, + /// + /// Out of memory. + /// OutOfMemoryError = ErrorCode.OutOfMemory, + /// + /// Permission Denied. + /// PermissionDeniedError = ErrorCode.PermissionDenied, + /// + /// Not Supported. + /// NotSupportedError = ErrorCode.NotSupported, - + /// + /// Not available communication with Mtp framework. + /// CommunicationError = MtpErrorValue.Base | 0x01, + /// + /// Controller Error. + /// ControllerError = MtpErrorValue.Base | 0x02, + /// + /// No device. + /// NoDeviceError = MtpErrorValue.Base | 0x03, + /// + /// Not Initialized. + /// NotInitializedError = MtpErrorValue.Base | 0x04, + /// + /// Not Activated. + /// NotActivatedError = MtpErrorValue.Base | 0x05, + /// + /// Not Activated Communication. + /// NotActivatedCommunicationError = MtpErrorValue.Base | 0x06, + /// + /// Plugin Fail. + /// PluginFailError = MtpErrorValue.Base | 0x07 } diff --git a/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpObject.cs b/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpObject.cs index 6607e13..d8209c4 100644 --- a/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpObject.cs +++ b/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpObject.cs @@ -361,11 +361,17 @@ namespace Tizen.Network.Mtp _objectHandle = objectHandle; } + /// + /// MtpObject destructor. + /// ~MtpObject() { Dispose(false); } + /// + /// Dispose + /// public void Dispose() { Dispose(true); diff --git a/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpStorage.cs b/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpStorage.cs index c6e38b4..df192e6 100644 --- a/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpStorage.cs +++ b/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpStorage.cs @@ -136,11 +136,17 @@ namespace Tizen.Network.Mtp _storageHandle = storageHandle; } + /// + /// MtpStorage destructor. + /// ~MtpStorage() { Dispose(false); } + /// + /// Dispose + /// public void Dispose() { Dispose(true); diff --git a/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcCardEmulationAdapter.cs b/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcCardEmulationAdapter.cs index 1fadabb..e445da3 100755 --- a/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcCardEmulationAdapter.cs +++ b/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcCardEmulationAdapter.cs @@ -141,11 +141,17 @@ namespace Tizen.Network.Nfc { } + /// + /// NfcCardEmulationAdpater destructor. + /// ~NfcCardEmulationAdapter() { Dispose(false); } + /// + /// Dispose + /// public void Dispose() { Dispose(true); diff --git a/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcErrorFactory.cs b/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcErrorFactory.cs index fd6849e..71d5f00 100644 --- a/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcErrorFactory.cs +++ b/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcErrorFactory.cs @@ -25,29 +25,101 @@ namespace Tizen.Network.Nfc /// 3 public enum NfcError { + /// + /// Successful. + /// None = ErrorCode.None, + /// + /// I/O Error. + /// IoError = ErrorCode.IoError, + /// + /// Invalid Parameter. + /// InvalidParameterError = ErrorCode.InvalidParameter, + /// + /// Out of Memory. + /// OutOfMemoryError = ErrorCode.OutOfMemory, + /// + /// Timed Out. + /// TimedOutError = ErrorCode.TimedOut, + /// + /// Device Busy. + /// DeviceBusyError = ErrorCode.ResourceBusy, + /// + /// Not Supported. + /// NotSupportedError = ErrorCode.NotSupported, + /// + /// Permission Denied. + /// PermissionDeniedError = ErrorCode.PermissionDenied, + /// + /// Operation Failed. + /// OperationFailedError = -0x01C20000 | 0x01, + /// + /// Invalied Ndef Message. + /// InvalidNdefMessageError = -0x01C20000 | 0x02, + /// + /// Invalid Record Type. + /// InvalidRecordTypeError = -0x01C20000 | 0x03, + /// + /// No Device. + /// NoDeviceError = -0x01C20000 | 0x04, + /// + /// Not Activated. + /// NotActivatedError = -0x01C20000 | 0x05, + /// + /// Already Activated. + /// AlreadyActivatedError = -0x01C20000 | 0x06, + /// + /// Already Deactivated. + /// AlreadyDeactivatedError = -0x01C20000 | 0x07, + /// + /// Read Only Ndef. + /// ReadOnlyNdefError = -0x01C20000 | 0x08, + /// + /// No Space On Ndef. + /// NoSpaceOnNdefError = -0x01C20000 | 0x09, + /// + /// No Ndef Message + /// NoNdefMessageError = -0x01C20000 | 0x0a, + /// + /// No Ndef Format + /// NotNdefFormatError = -0x01C20000 | 0x0b, + /// + /// Security Restricted + /// SecurityRestrictedError = -0x01C20000 | 0x0c, + /// + /// Illegal State + /// IllegalStateError = -0x01C20000 | 0x0d, + /// + /// Not Initialized + /// NotInitializedError = -0x01C20000 | 0x0e, + /// + /// Tag Not Supported + /// TagNotSupportedError = -0x01C20000 | 0x0f, + /// + /// Aid Already Registered + /// AidAlreadyRegisteredError = -0x01C20000 | 0x10 } diff --git a/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcNdefMessage.cs b/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcNdefMessage.cs index 1f74fcc..ae61d0d 100755 --- a/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcNdefMessage.cs +++ b/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcNdefMessage.cs @@ -70,11 +70,17 @@ namespace Tizen.Network.Nfc _messageHandle = messageHandle; } + /// + /// NfcNdefMessage destructor. + /// ~NfcNdefMessage() { Dispose(false); } + /// + /// Dispose + /// public void Dispose() { Dispose(true); diff --git a/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcNdefRecord.cs b/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcNdefRecord.cs index 25d330d..0eb894e 100755 --- a/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcNdefRecord.cs +++ b/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcNdefRecord.cs @@ -283,12 +283,18 @@ namespace Tizen.Network.Nfc NfcErrorFactory.ThrowNfcException(ret); } } - + + /// + /// NfcNdefRecord destructor. + /// ~NfcNdefRecord() { Dispose(false); } + /// + /// Dispose + /// public void Dispose() { Dispose(true); diff --git a/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcP2p.cs b/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcP2p.cs index 441bb08..15531de 100755 --- a/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcP2p.cs +++ b/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcP2p.cs @@ -56,11 +56,17 @@ namespace Tizen.Network.Nfc RegisterP2pDataReceivedEvent(); } + /// + /// NfcP2p destructor. + /// ~NfcP2p() { Dispose(false); } + /// + /// Dispose + /// public void Dispose() { Dispose(true); @@ -150,11 +156,17 @@ namespace Tizen.Network.Nfc _snepHandle = handle; } + /// + /// NfcSnep Distructor + /// ~NfcSnep() { Dispose(false); } + /// + /// Dispose + /// public void Dispose() { Dispose(true); diff --git a/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcP2pAdapter.cs b/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcP2pAdapter.cs index 6ee377b..3e50575 100755 --- a/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcP2pAdapter.cs +++ b/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcP2pAdapter.cs @@ -55,11 +55,17 @@ namespace Tizen.Network.Nfc RegisterP2pTargetDiscoveredEvent(); } + /// + /// NfcP2pAdapter destructor + /// ~NfcP2pAdapter() { Dispose(false); } + /// + /// Dispose + /// public void Dispose() { Dispose(true); diff --git a/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcSecureElement.cs b/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcSecureElement.cs index 228890d..0bcaf31 100755 --- a/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcSecureElement.cs +++ b/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcSecureElement.cs @@ -34,11 +34,17 @@ namespace Tizen.Network.Nfc _secureElementHandle = handle; } + /// + /// NfcSecureElement destructor. + /// ~NfcSecureElement() { Dispose(false); } + /// + /// Dispose + /// public void Dispose() { Dispose(true); diff --git a/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcTag.cs b/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcTag.cs index 883a0d3..f7be13c 100755 --- a/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcTag.cs +++ b/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcTag.cs @@ -108,11 +108,17 @@ namespace Tizen.Network.Nfc _tagHandle = handle; } + /// + /// NfcTag destructor. + /// ~NfcTag() { Dispose(false); } + /// + /// Dispose + /// public void Dispose() { Dispose(true); diff --git a/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcTagAdapter.cs b/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcTagAdapter.cs index 0f0dbc2..0c3c392 100755 --- a/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcTagAdapter.cs +++ b/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcTagAdapter.cs @@ -55,11 +55,17 @@ namespace Tizen.Network.Nfc RegisterTagDiscoveredEvent(); } + /// + /// NfcTagAdapter destructor. + /// ~NfcTagAdapter() { Dispose(false); } + /// + /// Dispose + /// public void Dispose() { Dispose(true); diff --git a/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardChannel.cs b/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardChannel.cs index e6a5255..e9015ac 100644 --- a/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardChannel.cs +++ b/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardChannel.cs @@ -115,11 +115,17 @@ namespace Tizen.Network.Smartcard _channelHandle = channelHandle; } + /// + /// SmartcardChannel destructor. + /// ~SmartcardChannel() { Dispose(false); } + /// + /// Dispose + /// public void Dispose() { Dispose(true); diff --git a/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardReader.cs b/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardReader.cs index 13e7c99..9bfca63 100644 --- a/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardReader.cs +++ b/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardReader.cs @@ -74,11 +74,17 @@ namespace Tizen.Network.Smartcard _readerHandle = handle; } + /// + /// SmartcardReader destructor. + /// ~SmartcardReader() { Dispose(false); } + /// + /// Dispose + /// public void Dispose() { Dispose(true); diff --git a/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardSession.cs b/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardSession.cs index 8ecc7aa..02815f4 100644 --- a/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardSession.cs +++ b/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardSession.cs @@ -110,11 +110,17 @@ namespace Tizen.Network.Smartcard _sessionHandle = sessionHandle; } + /// + /// SmartcardSession destructor. + /// ~SmartcardSession() { Dispose(false); } + /// + /// Dispose + /// public void Dispose() { Dispose(true); diff --git a/src/Tizen.Security.TEEC/doc/api/Tizen.Security.TEEC.md b/src/Tizen.Security.TEEC/doc/api/Tizen.Security.TEEC.md index f6da610..56fa50b 100644 --- a/src/Tizen.Security.TEEC/doc/api/Tizen.Security.TEEC.md +++ b/src/Tizen.Security.TEEC/doc/api/Tizen.Security.TEEC.md @@ -39,6 +39,11 @@ The key design principles of the TEE Client API are: the format of the messages which pass over the channel, or the protocols used by specific Trusted Applications. +For security reasons, each device vendor usually uses their own TEE solution. +If you intend your LibTeec application to be used on a real device, +you must test your application on the TEE solution provided by the specific vendor. +When developing and installing your trusted application, refer to the documentation provided by the vendor. + ## Example The following example demonstrates how to invoke command on Trused Application. diff --git a/src/Tizen.System.Feedback/Feedback/Feedback.cs b/src/Tizen.System.Feedback/Feedback/Feedback.cs index 6eaad73..7fa3669 100644 --- a/src/Tizen.System.Feedback/Feedback/Feedback.cs +++ b/src/Tizen.System.Feedback/Feedback/Feedback.cs @@ -86,6 +86,19 @@ namespace Tizen.System private const string LogTag = "Tizen.System.Feedback"; private readonly FeedbackPattern[] Pattern = new FeedbackPattern[39]; + + /// + /// Constructor of Feedback class + /// + /// 3 + /// Thrown when failed becuase the device (haptic, sound) is not supported. + /// Thrown when failed because of a system error. + /// http://tizen.org/privilege/haptic + /// + /// + /// Feedback feedback = new Feedback(); + /// + /// public Feedback() { Pattern[0].PatternNumber = 0; @@ -181,6 +194,9 @@ namespace Tizen.System } } + /// + /// Finalizes an instance of the Feedback class. + /// ~Feedback() { Interop.Feedback.FeedbackError res = (Interop.Feedback.FeedbackError)Interop.Feedback.Deinitialize(); diff --git a/src/Tizen.System.SystemSettings/Tizen.System.SystemSettings/SystemSettingsEventArgs.cs b/src/Tizen.System.SystemSettings/Tizen.System.SystemSettings/SystemSettingsEventArgs.cs index 13da678..a2b5553 100755 --- a/src/Tizen.System.SystemSettings/Tizen.System.SystemSettings/SystemSettingsEventArgs.cs +++ b/src/Tizen.System.SystemSettings/Tizen.System.SystemSettings/SystemSettingsEventArgs.cs @@ -21,6 +21,8 @@ namespace Tizen.System /// /// EventArgs type for the IncomingCallRingtoneChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class IncomingCallRingtoneChangedEventArgs : EventArgs { private readonly string _incomingCallRingtone = null; @@ -44,6 +46,8 @@ namespace Tizen.System /// /// EventArgs type for the WallpaperHomeScreenChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class WallpaperHomeScreenChangedEventArgs : EventArgs { private readonly string _wallpaperHomeScreen = null; @@ -67,6 +71,8 @@ namespace Tizen.System /// /// EventArgs type for the WallpaperLockScreenChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class WallpaperLockScreenChangedEventArgs : EventArgs { private readonly string _wallpaperLockScreen = null; @@ -90,6 +96,8 @@ namespace Tizen.System /// /// EventArgs type for the FontSizeChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class FontSizeChangedEventArgs : EventArgs { private readonly SystemSettingsFontSize _fontSize; @@ -113,6 +121,8 @@ namespace Tizen.System /// /// EventArgs type for the FontTypeChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class FontTypeChangedEventArgs : EventArgs { private readonly string _fontType = null; @@ -136,6 +146,8 @@ namespace Tizen.System /// /// EventArgs type for the MotionActivationChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class MotionActivationSettingChangedEventArgs : EventArgs { private readonly bool _motionActivation; @@ -159,6 +171,8 @@ namespace Tizen.System /// /// EventArgs type for the EmailAlertRingtoneChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class EmailAlertRingtoneChangedEventArgs : EventArgs { private readonly string _emailAlertRingtone = null; @@ -182,6 +196,8 @@ namespace Tizen.System /// /// EventArgs type for the UsbDebuggingSettingChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class UsbDebuggingSettingChangedEventArgs : EventArgs { private readonly bool _usbDebuggingEnabled; @@ -205,6 +221,8 @@ namespace Tizen.System /// /// EventArgs type for the Data3GNetworkSettingChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class Data3GNetworkSettingChangedEventArgs : EventArgs { private readonly bool _data3GNetworkEnabled; @@ -228,6 +246,8 @@ namespace Tizen.System /// /// EventArgs type for the LockscreenAppChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class LockscreenAppChangedEventArgs : EventArgs { private readonly string _lockscreenApp = null; @@ -251,6 +271,8 @@ namespace Tizen.System /// /// EventArgs type for the LocaleCountryChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class LocaleCountryChangedEventArgs : EventArgs { private readonly string _localeCountry = null; @@ -275,6 +297,8 @@ namespace Tizen.System /// /// EventArgs type for the LocaleLanguageChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class LocaleLanguageChangedEventArgs : EventArgs { private readonly string _localeLanguage = null; @@ -299,6 +323,8 @@ namespace Tizen.System /// /// EventArgs type for the LocaleTimeFormat24HourChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class LocaleTimeFormat24HourSettingChangedEventArgs : EventArgs { private readonly bool _localeTimeFormat24Hour; @@ -322,6 +348,8 @@ namespace Tizen.System /// /// EventArgs type for the LocaleTimeZoneChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class LocaleTimeZoneChangedEventArgs : EventArgs { private readonly string _localeTimeZone = null; @@ -345,6 +373,8 @@ namespace Tizen.System /// /// EventArgs type for the TimeChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class TimeChangedEventArgs : EventArgs { private readonly int _time; @@ -368,6 +398,8 @@ namespace Tizen.System /// /// EventArgs type for the SoundLockChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class SoundLockSettingChangedEventArgs : EventArgs { private readonly bool _soundLock; @@ -391,6 +423,8 @@ namespace Tizen.System /// /// EventArgs type for the SoundSilentModeChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class SoundSilentModeSettingChangedEventArgs : EventArgs { private readonly bool _soundSilentMode; @@ -414,6 +448,8 @@ namespace Tizen.System /// /// EventArgs type for the SoundTouchChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class SoundTouchSettingChangedEventArgs : EventArgs { private readonly bool _soundTouch; @@ -437,6 +473,8 @@ namespace Tizen.System /// /// EventArgs type for the DisplayScreenRotationAutoChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class DisplayScreenRotationAutoSettingChangedEventArgs : EventArgs { private readonly bool _displayScreenRotationAuto; @@ -460,6 +498,8 @@ namespace Tizen.System /// /// EventArgs type for the DeviceNameChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class DeviceNameChangedEventArgs : EventArgs { private readonly string _deviceName = null; @@ -483,6 +523,8 @@ namespace Tizen.System /// /// EventArgs type for the MotionSettingChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class MotionSettingChangedEventArgs : EventArgs { private readonly bool _motionEnabled; @@ -506,6 +548,8 @@ namespace Tizen.System /// /// EventArgs type for the NetworkWifiNotificationChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class NetworkWifiNotificationSettingChangedEventArgs : EventArgs { private readonly bool _networkWifiNotification; @@ -529,6 +573,8 @@ namespace Tizen.System /// /// EventArgs type for the NetworkFlightModeChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class NetworkFlightModeSettingChangedEventArgs : EventArgs { private readonly bool _networkFlightMode; @@ -552,6 +598,8 @@ namespace Tizen.System /// /// EventArgs type for the ScreenBacklightTimeChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class ScreenBacklightTimeChangedEventArgs : EventArgs { private readonly int _screenBacklightTime; @@ -575,6 +623,8 @@ namespace Tizen.System /// /// EventArgs type for the SoundNotificationChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class SoundNotificationChangedEventArgs : EventArgs { private readonly string _soundNotification = null; @@ -598,6 +648,8 @@ namespace Tizen.System /// /// EventArgs type for the SoundNotificationRepetitionPeriodChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class SoundNotificationRepetitionPeriodChangedEventArgs : EventArgs { private readonly int _soundNotificationRepetitionPeriod; @@ -621,6 +673,8 @@ namespace Tizen.System /// /// EventArgs type for the LockStateChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class LockStateChangedEventArgs : EventArgs { private readonly SystemSettingsIdleLockState _lockState; @@ -644,6 +698,8 @@ namespace Tizen.System /// /// EventArgs type for the AdsIdChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class AdsIdChangedEventArgs : EventArgs { private readonly string _adsId = null; @@ -667,6 +723,8 @@ namespace Tizen.System /// /// EventArgs type for the UltraDataSaveChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class UltraDataSaveChangedEventArgs : EventArgs { private readonly SystemSettingsUdsState _ultraDataSave = SystemSettingsUdsState.UdsOff; @@ -690,6 +748,8 @@ namespace Tizen.System /// /// EventArgs type for the UltraDataSavePackageListChanged event. /// + /// http://tizen.org/privilege/systemsettings.admin + /// platform public class UltraDataSavePackageListChangedEventArgs : EventArgs { private readonly string _ultraDataSavePackageList = null; -- 2.7.4