commit 53d16d39dd9ec7095b9fb635de3811764db08a7e
author Zim <zezeozue@google.com> Fri Jan 17 01:21:24 2020 +0000
committer Zimuzo Ezeozue <zezeozue@google.com> Fri Jan 17 01:37:08 2020 +0000
tree 6b5854e066e1cb3b71d033e9e07feb8bf4a2c396
parent d0c7c52edc0cda7947874bf73b3cced6d882b5d9

Always symlink self/primary to /storage/emulated

This allows readlink(2) of /sdcard paths to work correctly
and return /storage/emulated/<userid> instead of
/mnt/user/<userid>/emulated/<userid>

Test: readlink /sdcard -> /storage/emulated/0
Bug: 135341433
Change-Id: I2cfa9cede02a93024e41d90f17c926a69ec6e052

Utils.cpp

diff --git a/Utils.cpp b/Utils.cpp
index a798b27..a66e33c 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -1056,7 +1056,7 @@
             return -1;
         }
         linkpath += "/primary";
-        Symlink(fuse_path + "/" + std::to_string(user_id), linkpath);
+        Symlink("/storage/emulated/" + std::to_string(user_id), linkpath);
 
         std::string pass_through_linkpath(StringPrintf("/mnt/pass_through/%d/self", user_id));
         result = PrepareDir(pass_through_linkpath, 0755, AID_ROOT, AID_ROOT);
@@ -1065,7 +1065,7 @@
             return -1;
         }
         pass_through_linkpath += "/primary";
-        Symlink(pass_through_path + "/" + std::to_string(user_id), pass_through_linkpath);
+        Symlink("/storage/emulated/" + std::to_string(user_id), pass_through_linkpath);
     }
 
     // Open fuse fd.