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

diff --git a/src/Tizen.Applications.Common/Tizen.Applications.RPCPort/Parcel.cs b/src/Tizen.Applications.Common/Tizen.Applications.RPCPort/Parcel.cs
index a5f88f5..99f6c34 100755 (executable)
--- a/src/Tizen.Applications.Common/Tizen.Applications.RPCPort/Parcel.cs
+++ b/src/Tizen.Applications.Common/Tizen.Applications.RPCPort/Parcel.cs
@@ -36,7 +36,7 @@ namespace Tizen.Applications.RPCPort
         }
 
         /// <summary>
-        /// The second of TimeStamp.
+        /// The seconds of TimeStamp.
         /// </summary>
         /// <since_tizen> 9 </since_tizen>
         public long Second
@@ -46,7 +46,7 @@ namespace Tizen.Applications.RPCPort
         }
 
         /// <summary>
-        /// The nano second of TimeStamp.
+        /// The nano seconds of TimeStamp.
         /// </summary>
         /// <since_tizen> 9 </since_tizen>
         public long NanoSecond
@@ -57,7 +57,7 @@ namespace Tizen.Applications.RPCPort
     }
 
     /// <summary>
-    /// The class is the header that has the Parcel's information.
+    /// The class represents the header information of an RPC Parcel.
     /// </summary>
     /// <since_tizen> 9 </since_tizen>
     public class ParcelHeader

diff --git a/src/Tizen.Applications.Common/Tizen.Applications/CoreApplication.cs b/src/Tizen.Applications.Common/Tizen.Applications/CoreApplication.cs
index dd23082..487cb89 100644 (file)
--- a/src/Tizen.Applications.Common/Tizen.Applications/CoreApplication.cs
+++ b/src/Tizen.Applications.Common/Tizen.Applications/CoreApplication.cs
@@ -279,12 +279,28 @@ namespace Tizen.Applications
 
         private void ChangeCurrentCultureInfo(string locale)
         {
-            CultureInfo.CurrentCulture = ConvertCultureInfo(locale);
+            CultureInfo cultureInfo = ConvertCultureInfo(locale);
+            if (cultureInfo != null)
+            {
+                CultureInfo.CurrentCulture = cultureInfo;
+            }
+            else
+            {
+                Log.Error(LogTag, "CultureInfo is null. locale: " + locale);
+            }
         }
 
         private void ChangeCurrentUICultureInfo(string locale)
         {
-            CultureInfo.CurrentUICulture = ConvertCultureInfo(locale);
+            CultureInfo cultureInfo = ConvertCultureInfo(locale);
+            if (cultureInfo != null)
+            {
+                CultureInfo.CurrentUICulture = cultureInfo;
+            }
+            else
+            {
+                Log.Error(LogTag, "CultureInfo is null. locale: " + locale);
+            }
         }
 
         private bool ExistCultureInfo(string locale)
@@ -354,8 +370,14 @@ namespace Tizen.Applications
 
             if (fallbackCultureInfo == null)
             {
-                locale = "en";
-                fallbackCultureInfo = GetCultureInfo(locale);
+                try
+                {
+                    fallbackCultureInfo = new CultureInfo("en");
+                }
+                catch (CultureNotFoundException e)
+                {
+                    Log.Error(LogTag, "Failed to create CultureInfo. err = " + e.Message);
+                }
             }
 
             return fallbackCultureInfo;

diff --git a/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothEnumerations.cs b/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothEnumerations.cs
index 70c504e..3f070d4 100644 (file)
--- a/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothEnumerations.cs
+++ b/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothEnumerations.cs
@@ -1321,6 +1321,10 @@ namespace Tizen.Network.Bluetooth
         /// Service removed.
         /// </summary>
         Removed,
+        /// <summary>
+        /// Resync is required.
+        /// </summary>
+        Resync,
     }
 
     /// <summary>