commit ce8f8edcc41d65fd0ba9ad136baeeef18fcabb39
author Jeff Sharkey <jsharkey@google.com> Thu Aug 06 21:31:49 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 06 21:31:49 2015 +0000
tree 73cf951290e53acea26fbc28734369747926b5e7
parent 212157e3cdbf4d685927fe8bfc2e5c99bcb8f390
parent 48697332c7793d17a12887b5d508aeb96049c7f7

am 48697332: am 0c2df694: am 7d28ad9b: am cb54ffb2: Merge "Protect runtime storage mount points." into mnc-dev

* commit '48697332c7793d17a12887b5d508aeb96049c7f7':
  Protect runtime storage mount points.

core/jni/com_android_internal_os_Zygote.cpp

diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp
index dbf63b5..4c920dc 100644
--- a/core/jni/com_android_internal_os_Zygote.cpp
+++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -298,11 +298,11 @@
 
     String8 storageSource;
     if (mount_mode == MOUNT_EXTERNAL_DEFAULT) {
-        storageSource = "/mnt/runtime_default";
+        storageSource = "/mnt/runtime/default";
     } else if (mount_mode == MOUNT_EXTERNAL_READ) {
-        storageSource = "/mnt/runtime_read";
+        storageSource = "/mnt/runtime/read";
     } else if (mount_mode == MOUNT_EXTERNAL_WRITE) {
-        storageSource = "/mnt/runtime_write";
+        storageSource = "/mnt/runtime/write";
     } else {
         // Sane default of no storage visible
         return true;