Merge remote-tracking branch 'origin/API6' into tizen_5.5

diff --git a/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs b/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs
index a796019..75f1cf1 100755 (executable)
--- a/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs
+++ b/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs
@@ -404,7 +404,10 @@ namespace Tizen.NUI
 
         private void DirectorOnSetResizePolicy(int policy, int dimension)
         {
-            OnSetResizePolicy((ResizePolicyType)policy, (DimensionType)dimension);
+            if (null != OnSetResizePolicy)
+            {
+                OnSetResizePolicy((ResizePolicyType)policy, (DimensionType)dimension);
+            }
         }
 
         private global::System.IntPtr DirectorGetNaturalSize()

diff --git a/src/Tizen.NUI/src/public/FocusManager.cs b/src/Tizen.NUI/src/public/FocusManager.cs
index e6736af..f332366 100755 (executable)
--- a/src/Tizen.NUI/src/public/FocusManager.cs
+++ b/src/Tizen.NUI/src/public/FocusManager.cs
@@ -782,6 +782,11 @@ namespace Tizen.NUI
 
             public override View GetNextFocusableView(View current, View proposed, View.FocusDirection direction)
             {
+                if(_customFocusAlgorithm == null)
+                {
+                    Tizen.Log.Error("NUI", $"[ERROR] User defined ICustomFocusAlgorithm interface class becomes unreachable. Null will be proposed for next focusing!");
+                    return null;
+                }
                 return _customFocusAlgorithm.GetNextFocusableView(current, proposed, direction);
             }
         }