Merge "Migrate from android::String path functions to std::filesystem" into main am: 0d0326fd9a am: c5a3087b46 am: cabb9a4530 am: 1e3b507f85

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2721818

Change-Id: I7bbda7d455200a9c2dac979f8bf245ba471bdbb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 3 insertions, 4 deletions

diff --git a/cmds/cmd/cmd.cpp b/cmds/cmd/cmd.cpp
index b7273987b6..0ce7711574 100644
--- a/cmds/cmd/cmd.cpp
+++ b/cmds/cmd/cmd.cpp
@@ -27,6 +27,7 @@
 #include <utils/Mutex.h>
 #include <utils/Vector.h>
 
+#include <filesystem>
 #include <getopt.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -69,10 +70,8 @@ public:
     virtual int openFile(const String16& path, const String16& seLinuxContext,
             const String16& mode) {
         String8 path8(path);
-        char cwd[256];
-        getcwd(cwd, 256);
-        String8 fullPath(cwd);
-        fullPath.appendPath(path8);
+        auto fullPath = std::filesystem::current_path();
+        fullPath /= path8.c_str();
         if (!mActive) {
             mErrorLog << "Open attempt after active for: " << fullPath << endl;
             return -EPERM;