Commit: 7bf5efdff76698763f0bcbfff1a2846bd56b7b1f - external-koush-Superuser (git)

external/koush/Superuser

Commit MetaInfo

• Revision: 7bf5efdff76698763f0bcbfff1a2846bd56b7b1f (tree)
• Time: 2014-02-05 17:10:28
• Author: Danny Baumann <dannybaumann@web....>
• Commiter: Gerrit Code Review

Log Message

Merge "Fix merge derp: Emulated storage should be mounted in the child, not the parent." into cm-11.0

Change Summary

• modified: Superuser/jni/su/daemon.c

Incremental Difference

--- a/Superuser/jni/su/daemon.c
+++ b/Superuser/jni/su/daemon.c
@@ -356,12 +356,6 @@ static int daemon_accept(int fd) {
             PLOGE("unable to write exit code");
         }
 
-#ifdef SUPERUSER_EMBEDDED
-        if (mount_storage) {
-            mount_emulated_storage(multiuser_get_user_id(daemon_from_uid));
-        }
-#endif
-
         close(fd);
         LOGD("child exited");
         return code;
@@ -406,6 +400,12 @@ static int daemon_accept(int fd) {
     }
     free(pts_slave);
 
+#ifdef SUPERUSER_EMBEDDED
+    if (mount_storage) {
+        mount_emulated_storage(multiuser_get_user_id(daemon_from_uid));
+    }
+#endif
+
     return run_daemon_child(infd, outfd, errfd, argc, argv);
 }