Merge "[IoTConnectivity] Fix build warnings"

diff --git a/pkg/PlatformFileList.txt b/pkg/PlatformFileList.txt
index 5026b09..0b4ab6c 100644 (file)
--- a/pkg/PlatformFileList.txt
+++ b/pkg/PlatformFileList.txt
@@ -28,7 +28,7 @@ Tizen.Applications.WidgetControl.dll               #mobile #mobile-emul #tv #ivi
 Tizen.Content.Download.dll                         #common #mobile #mobile-emul #tv #ivi #wearable
 Tizen.Content.MediaContent.dll                     #common #mobile #mobile-emul #tv #ivi #wearable
 Tizen.Content.MimeType.dll                         #common #mobile #mobile-emul #tv #ivi #wearable
-Tizen.Context.dll                                  #mobile #mobile-emul
+Tizen.Context.dll                                  #mobile #mobile-emul #wearable
 Tizen.Convergence.dll                              #common #mobile #mobile-emul #ivi #wearable
 Tizen.dll                                          #common #mobile #mobile-emul #tv #ivi #wearable
 Tizen.Location.dll                                 #mobile #mobile-emul #tv #ivi #wearable

diff --git a/src/Tizen.Context/Tizen.Context.AppHistory/BatteryStatistics.cs b/src/Tizen.Context/Tizen.Context.AppHistory/BatteryStatistics.cs
index f820525..7f62590 100644 (file)
--- a/src/Tizen.Context/Tizen.Context.AppHistory/BatteryStatistics.cs
+++ b/src/Tizen.Context/Tizen.Context.AppHistory/BatteryStatistics.cs
@@ -29,9 +29,10 @@ namespace Tizen.Context.AppHistory
         /// <summary>
         ///  The default constructor of BatteryStatistics class.
         /// </summary>
+        /// <feature>http://tizen.org/feature/app_history</feature>
         /// <feature>http://tizen.org/feature/battery</feature>
         /// <exception cref="InvalidOperationException">Thrown when method fail due to internal error.</exception>
-        /// <exception cref="NotSupportedException">Thrown when the statistics is not supported.</exception>
+        /// <exception cref="NotSupportedException">Thrown when the features are not supported.</exception>
         public BatteryStatistics()
         {
             SortOrder = SortOrderType.ConsumptionMost;
@@ -54,10 +55,11 @@ namespace Tizen.Context.AppHistory
         /// The constructor of BatteryStatistics class.
         /// </summary>
         /// <param name="order">The criteria of the battery statistics sorted by.</param>
+        /// <feature>http://tizen.org/feature/app_history</feature>
         /// <feature>http://tizen.org/feature/battery</feature>
         /// <exception cref="ArgumentException">Thrown when an invalid argument is used.</exception>
         /// <exception cref="InvalidOperationException">Thrown when method fail due to internal error.</exception>
-        /// <exception cref="NotSupportedException">Thrown when the statistics is not supported.</exception>
+        /// <exception cref="NotSupportedException">Thrown when the features are not supported.</exception>
         public BatteryStatistics(SortOrderType order)
         {
             SortOrder = order;
@@ -88,8 +90,11 @@ namespace Tizen.Context.AppHistory
         /// <param name="endTime">The end time of the data to be aggregated.</param>
         /// <returns>Battery statistics data retrieved.</returns>
         /// <privilege>http://tizen.org/privilege/apphistory.read</privilege>
+        /// <feature>http://tizen.org/feature/app_history</feature>
+        /// <feature>http://tizen.org/feature/battery</feature>
         /// <exception cref="ArgumentException">Thrown when an invalid argument is used.</exception>
         /// <exception cref="InvalidOperationException">Thrown when invalid operation occurs.</exception>
+        /// <exception cref="NotSupportedException">Thrown when the features are not supported.</exception>
         /// <exception cref="UnauthorizedAccessException">Thrown when the app has no privilege to retrieve app history.</exception>
         public IReadOnlyList<BatteryStatisticsData> Query(DateTime startTime, DateTime endTime)
         {
@@ -106,8 +111,11 @@ namespace Tizen.Context.AppHistory
         /// <param name="resultSize">The number of data records to be retrieved.</param>
         /// <returns>Battery statistics data retrieved.</returns>
         /// <privilege>http://tizen.org/privilege/apphistory.read</privilege>
+        /// <feature>http://tizen.org/feature/app_history</feature>
+        /// <feature>http://tizen.org/feature/battery</feature>
         /// <exception cref="ArgumentException">Thrown when an invalid argument is used.</exception>
         /// <exception cref="InvalidOperationException">Thrown when invalid operation occurs.</exception>
+        /// <exception cref="NotSupportedException">Thrown when the features are not supported.</exception>
         /// <exception cref="UnauthorizedAccessException">Thrown when the app has no privilege to retrieve app history.</exception>
         public IReadOnlyList<BatteryStatisticsData> Query(DateTime startTime, DateTime endTime, uint resultSize)
         {
@@ -146,6 +154,7 @@ namespace Tizen.Context.AppHistory
         /// Gets the last time when the device was fully charged.
         /// </summary>
         /// <returns>The last time when the device was fully charged.</returns>
+        /// <feature>http://tizen.org/feature/app_history</feature>
         /// <feature>http://tizen.org/feature/battery</feature>
         /// <exception cref="NotSupportedException">Thrown when the statistics is not supported.</exception>
         public static DateTime GetLastFullyChargedTime()

diff --git a/src/Tizen.Context/Tizen.Context.AppHistory/UsageStatistics.cs b/src/Tizen.Context/Tizen.Context.AppHistory/UsageStatistics.cs
index a23d820..9a96f29 100644 (file)
--- a/src/Tizen.Context/Tizen.Context.AppHistory/UsageStatistics.cs
+++ b/src/Tizen.Context/Tizen.Context.AppHistory/UsageStatistics.cs
@@ -31,7 +31,9 @@ namespace Tizen.Context.AppHistory
         /// <summary>
         /// The default constructor of UsageStatistics class.
         /// </summary>
+        /// <feature>http://tizen.org/feature/app_history</feature>
         /// <exception cref="InvalidOperationException">Thrown when method fail due to internal error.</exception>
+        /// <exception cref="NotSupportedException">Thrown when the feature is not supported.</exception>
         public UsageStatistics()
         {
             SortOrder = SortOrderType.LastLaunchTimeNewest;
@@ -54,8 +56,10 @@ namespace Tizen.Context.AppHistory
         /// The constructor of UsageStatistics class.
         /// </summary>
         /// <param name="order">The criteria of the usage statistics sorted by.</param>
+        /// <feature>http://tizen.org/feature/app_history</feature>
         /// <exception cref="ArgumentException">Thrown when an invalid argument is used.</exception>
         /// <exception cref="InvalidOperationException">Thrown when method fail due to internal error.</exception>
+        /// <exception cref="NotSupportedException">Thrown when the feature is not supported.</exception>
         public UsageStatistics(SortOrderType order)
         {
             SortOrder = order;
@@ -86,8 +90,10 @@ namespace Tizen.Context.AppHistory
         /// <param name="endTime">The end time of the data to be aggregated.</param>
         /// <returns>Usage statistics data retrieved.</returns>
         /// <privilege>http://tizen.org/privilege/apphistory.read</privilege>
+        /// <feature>http://tizen.org/feature/app_history</feature>
         /// <exception cref="ArgumentException">Thrown when an invalid argument is used.</exception>
         /// <exception cref="InvalidOperationException">Thrown when invalid operation occurs.</exception>
+        /// <exception cref="NotSupportedException">Thrown when the feature is not supported.</exception>
         /// <exception cref="UnauthorizedAccessException">Thrown when the app has no privilege to retrieve app history.</exception>
         public IReadOnlyList<UsageStatisticsData> Query(DateTime startTime, DateTime endTime)
         {
@@ -104,8 +110,10 @@ namespace Tizen.Context.AppHistory
         /// <param name="resultSize">The number of data records to be retrieved.</param>
         /// <returns>Usage statistics data retrieved.</returns>
         /// <privilege>http://tizen.org/privilege/apphistory.read</privilege>
+        /// <feature>http://tizen.org/feature/app_history</feature>
         /// <exception cref="ArgumentException">Thrown when an invalid argument is used.</exception>
         /// <exception cref="InvalidOperationException">Thrown when invalid operation occurs.</exception>
+        /// <exception cref="NotSupportedException">Thrown when the feature is not supported.</exception>
         /// <exception cref="UnauthorizedAccessException">Thrown when the app has no privilege to retrieve app history.</exception>
         public IReadOnlyList<UsageStatisticsData> Query(DateTime startTime, DateTime endTime, uint resultSize)
         {

diff --git a/src/Tizen.Location/Tizen.Location/GpsSatellite.cs b/src/Tizen.Location/Tizen.Location/GpsSatellite.cs
index d2c35aa..254bfb6 100755 (executable)
--- a/src/Tizen.Location/Tizen.Location/GpsSatellite.cs
+++ b/src/Tizen.Location/Tizen.Location/GpsSatellite.cs
@@ -179,15 +179,12 @@ namespace Tizen.Location
             List<SatelliteInformation> satelliteList = new List<SatelliteInformation>();
             Log.Info(Globals.LogTag, "Getting the list of satellites");
 
-            if (_satelliteStatusinfomationCallback == null)
+            _satelliteStatusinfomationCallback = (azimuth, elevation, prn, snr, active, userData) =>
             {
-                _satelliteStatusinfomationCallback = (azimuth, elevation, prn, snr, active, userData) =>
-                {
-                    SatelliteInformation satellite = new SatelliteInformation(azimuth, elevation, prn, snr, active);
-                    satelliteList.Add(satellite);
-                    return true;
-                };
-            }
+                SatelliteInformation satellite = new SatelliteInformation(azimuth, elevation, prn, snr, active);
+                satelliteList.Add(satellite);
+                return true;
+            };
 
             int ret = Interop.GpsSatellite.GetForEachSatelliteInView(_handle, _satelliteStatusinfomationCallback, IntPtr.Zero);
             if (((LocationError)ret != LocationError.None))

diff --git a/src/Tizen.Pims.Contacts/Tizen.Pims.Contacts/ContactsDatabase.cs b/src/Tizen.Pims.Contacts/Tizen.Pims.Contacts/ContactsDatabase.cs
index 4be2929..b5a529b 100644 (file)
--- a/src/Tizen.Pims.Contacts/Tizen.Pims.Contacts/ContactsDatabase.cs
+++ b/src/Tizen.Pims.Contacts/Tizen.Pims.Contacts/ContactsDatabase.cs
@@ -35,7 +35,6 @@ namespace Tizen.Pims.Contacts
         private EventHandler<DBStatusChangedEventArgs> _dbStatusChanged;
         private Dictionary<string, EventHandler<DBChangedEventArgs>> _eventHandlerMap = new Dictionary<string, EventHandler<DBChangedEventArgs>>();
         private Dictionary<string, Interop.Database.ContactsDBChangedCallback> _callbackMap = new Dictionary<string, Interop.Database.ContactsDBChangedCallback>();
-        private Interop.Database.ContactsDBChangedCallback _dbChangedDelegate;
 
         internal ContactsDatabase()
         {

diff --git a/src/Tizen.System.Information/SystemInfo/SystemInfo.cs b/src/Tizen.System.Information/SystemInfo/SystemInfo.cs
index 5c352f0..dccc4ba 100755 (executable)
--- a/src/Tizen.System.Information/SystemInfo/SystemInfo.cs
+++ b/src/Tizen.System.Information/SystemInfo/SystemInfo.cs
@@ -19,8 +19,9 @@ using System.ComponentModel;
 
 namespace Tizen.System
 {
+    [Obsolete("Use class Tizen.System.Information")]
     [EditorBrowsable(EditorBrowsableState.Never)]
-    internal static class SystemInfo
+    public static class SystemInfo
     {
         [EditorBrowsable(EditorBrowsableState.Never)]
         private static Interop.SystemInfo.SystemInfoType GetValueType(string key, out Interop.SystemInfo.SystemInfoValueType valueType)
@@ -89,7 +90,7 @@ namespace Tizen.System
         /// <param name="key">The name of the feature.</param>
         /// <param name="value">The value of the given feature.</param>
         /// <returns>Returns true on success, otherwise false.</returns>
-        internal static bool TryGetValue<T>(string key, out T value)
+        public static bool TryGetValue<T>(string key, out T value)
         {
             bool res = false;
             if (typeof(T) == typeof(bool))
@@ -129,7 +130,7 @@ namespace Tizen.System
         /// <param name="key">The name of the feature.</param>
         /// <param name="value">The value of the given feature.</param>
         /// <returns>Returns true on success, otherwise false.</returns>
-        internal static bool TryGetValue(string key, out bool value)
+        public static bool TryGetValue(string key, out bool value)
         {
             Interop.SystemInfo.SystemInfoValueType valueType;
             Interop.SystemInfo.SystemInfoType keyType = GetValueType(key, out valueType);
@@ -162,7 +163,7 @@ namespace Tizen.System
         /// <param name="key">The name of the feature.</param>
         /// <param name="value">The value of the given feature.</param>
         /// <returns>Returns true on success, otherwise false.</returns>
-        internal static bool TryGetValue(string key, out int value)
+        public static bool TryGetValue(string key, out int value)
         {
             Interop.SystemInfo.SystemInfoValueType valueType;
             Interop.SystemInfo.SystemInfoType keyType = GetValueType(key, out valueType);
@@ -196,7 +197,7 @@ namespace Tizen.System
         /// <param name="key">The name of the feature.</param>
         /// <param name="value">The value of the given feature.</param>
         /// <returns>Returns true on success, otherwise false.</returns>
-        internal static bool TryGetValue(string key, out double value)
+        public static bool TryGetValue(string key, out double value)
         {
             Interop.SystemInfo.SystemInfoValueType valueType;
             Interop.SystemInfo.SystemInfoType keyType = GetValueType(key, out valueType);
@@ -230,7 +231,7 @@ namespace Tizen.System
         /// <param name="key">The name of the feature.</param>
         /// <param name="value">The value of the given feature.</param>
         /// <returns>Returns true on success, otherwise false.</returns>
-        internal static bool TryGetValue(string key, out string value)
+        public static bool TryGetValue(string key, out string value)
         {
             Interop.SystemInfo.SystemInfoValueType valueType;
             Interop.SystemInfo.SystemInfoType keyType = GetValueType(key, out valueType);