commit 7c5e6a3268dc25207633ce1ff5958ce705aba77a
author Jeff Sharkey <jsharkey@android.com> Tue Sep 10 18:25:19 2013 -0700
committer Jeff Sharkey <jsharkey@android.com> Tue Sep 10 18:27:07 2013 -0700
tree c4daa53aeaa2170f8cbda34ae4bfe56c3d8bdff8
parent d288f74190feb0605b7903a09b0c08cf015d8b7c

Remove OBB bind mounts, now provided by FUSE.

The OBB storage area is now presented on a per-user basis by the FUSE
daemon, so we no longer need to create bind mounts.  (In fact, we
must use the FUSE daemon since it now correctly synthesizes UID
ownership on a per-user basis.)

Bug: 10506809
Change-Id: I2d6c5643d7c89d7a15ceb28af871e44618ad33ad

vm/native/dalvik_system_Zygote.cpp

diff --git a/vm/native/dalvik_system_Zygote.cpp b/vm/native/dalvik_system_Zygote.cpp
index 70d4fea..e2b618b 100644
--- a/vm/native/dalvik_system_Zygote.cpp
+++ b/vm/native/dalvik_system_Zygote.cpp
@@ -271,18 +271,14 @@
 
         // Prepare source paths
         char source_user[PATH_MAX];
-        char source_obb[PATH_MAX];
         char target_user[PATH_MAX];
 
         // /mnt/shell/emulated/0
         snprintf(source_user, PATH_MAX, "%s/%d", source, userid);
-        // /mnt/shell/emulated/obb
-        snprintf(source_obb, PATH_MAX, "%s/obb", source);
         // /storage/emulated/0
         snprintf(target_user, PATH_MAX, "%s/%d", target, userid);
 
         if (fs_prepare_dir(source_user, 0000, 0, 0) == -1
-                || fs_prepare_dir(source_obb, 0000, 0, 0) == -1
                 || fs_prepare_dir(target_user, 0000, 0, 0) == -1) {
             return -1;
         }
@@ -301,23 +297,7 @@
             }
         }
 
-        // Now that user is mounted, prepare and mount OBB storage
-        // into place for current user
-        char target_android[PATH_MAX];
-        char target_obb[PATH_MAX];
-
-        // /storage/emulated/0/Android
-        snprintf(target_android, PATH_MAX, "%s/%d/Android", target, userid);
-        // /storage/emulated/0/Android/obb
-        snprintf(target_obb, PATH_MAX, "%s/%d/Android/obb", target, userid);
-
-        if (fs_prepare_dir(target_android, 0000, 0, 0) == -1
-                || fs_prepare_dir(target_obb, 0000, 0, 0) == -1
-                || fs_prepare_dir(legacy, 0000, 0, 0) == -1) {
-            return -1;
-        }
-        if (mount(source_obb, target_obb, NULL, MS_BIND, NULL) == -1) {
-            ALOGE("Failed to mount %s to %s: %s", source_obb, target_obb, strerror(errno));
+        if (fs_prepare_dir(legacy, 0000, 0, 0) == -1) {
             return -1;
         }