Integrating github/staging through commit 5f214be

Code/Framework/AzFramework/Platform/Android/AzFramework/IO/LocalFileIO_Android.cpp

@@ -16,13 +16,14 @@
 #include <AzCore/Android/APKFileHandler.h>
 #include <AzCore/Android/Utils.h>
 #include <AzCore/IO/IOUtils.h>
+#include <AzCore/IO/Path/Path.h>
 #include <AzCore/IO/SystemFile.h>
 #include <AzCore/std/functional.h>
 
 #include <android/api-level.h>
 
 #if __ANDROID_API__ == 19
-    // The following were apparently introduced in API 21, however in earlier versions of the 
+    // The following were apparently introduced in API 21, however in earlier versions of the
     // platform specific headers they were defines.  In the move to unified headers, the following
     // defines were removed from stat.h
     #ifndef stat64
@@ -52,7 +53,7 @@ namespace AZ
 
             if (AZ::Android::Utils::IsApkPath(resolvedPath))
             {
-                return AZ::Android::APKFileHandler::IsDirectory(AZ::Android::Utils::StripApkPrefix(resolvedPath));
+                return AZ::Android::APKFileHandler::IsDirectory(AZ::Android::Utils::StripApkPrefix(resolvedPath).c_str());
             }
 
             struct stat result;
@@ -108,7 +109,7 @@ namespace AZ
 
             if (isInAPK)
             {
-                AZ::OSString strippedPath = AZ::Android::Utils::StripApkPrefix(pathWithoutSlash.c_str());
+                AZ::IO::FixedMaxPath strippedPath = AZ::Android::Utils::StripApkPrefix(pathWithoutSlash.c_str());
 
                 char tempBuffer[AZ_MAX_PATH_LEN] = {0};
 

Code/Framework/AzFramework/Platform/Windows/AzFramework/TargetManagement/TargetManagementComponent_Windows.cpp

@@ -21,7 +21,7 @@ namespace AzFramework
     {
         AZStd::string GetPersistentName()
         {
-            AZStd::string persistentName = "Lumberyard";
+            AZStd::string persistentName = "Open 3D Engine";
 
             char procPath[AZ_MAX_PATH_LEN];
             AZ::Utils::GetExecutablePathReturnType ret = AZ::Utils::GetExecutablePath(procPath, AZ_MAX_PATH_LEN);

Code/Framework/AzFramework/Platform/Windows/AzFramework/Windowing/NativeWindow_Windows.cpp

@@ -56,7 +56,7 @@ namespace AzFramework
         bool m_isInBorderlessWindowFullScreenState = false; //!< Was a borderless window used to enter full screen state?
     };
 
-    const char* NativeWindowImpl_Win32::s_defaultClassName = "LumberyardWin32Class";
+    const char* NativeWindowImpl_Win32::s_defaultClassName = "O3DEWin32Class";
 
     NativeWindow::Implementation* NativeWindow::Implementation::Create()
     {

Code/Framework/AzFramework/Platform/iOS/AzFramework/Input/Devices/Motion/InputDeviceMotion_iOS.mm

@@ -85,7 +85,7 @@ namespace AzFramework
         //!
         //! return another vector relative to the specified display orientation, and such that the
         //! +y axis points out the back of the screen and z+ axis points out the top of the device.
-        //! This flipping of axes is to match Lumberyard's z-up and left-handed coordinate system.
+        //! This flipping of axes is to match Open 3D Engine's z-up and left-handed coordinate system.
         //!
         //! \param[in] x The x component of the vector to be aligned
         //! \param[in] y The y component of the vector to be aligned