diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2019-01-19 18:04:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-01-19 18:04:40 +0000 |
| commit | 7461df211d760d06cd030ebfcef6fb6aea5f6dd3 (patch) | |
| tree | 15288687be0dab09dd7223db7a07d8754f81eb3d /core/java | |
| parent | 0d2740ca697b441f5a37713e3b9e2630f0c9aac3 (diff) | |
| parent | 0b6da5362d5cf8c62bad2a8c35aabb00cbf7d976 (diff) | |
Merge "Create a new MOUNT_EXTERNAL_LEGACY storage mode."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/os/ZygoteProcess.java | 2 | ||||
| -rw-r--r-- | core/java/com/android/internal/os/Zygote.java | 5 | ||||
| -rw-r--r-- | core/java/com/android/internal/os/ZygoteConnection.java | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/core/java/android/os/ZygoteProcess.java b/core/java/android/os/ZygoteProcess.java index 99a85eaefe53..ec7782177c73 100644 --- a/core/java/android/os/ZygoteProcess.java +++ b/core/java/android/os/ZygoteProcess.java @@ -402,6 +402,8 @@ public class ZygoteProcess { argsForZygote.add("--mount-external-full"); } else if (mountExternal == Zygote.MOUNT_EXTERNAL_INSTALLER) { argsForZygote.add("--mount-external-installer"); + } else if (mountExternal == Zygote.MOUNT_EXTERNAL_LEGACY) { + argsForZygote.add("--mount-external-legacy"); } argsForZygote.add("--target-sdk-version=" + targetSdkVersion); diff --git a/core/java/com/android/internal/os/Zygote.java b/core/java/com/android/internal/os/Zygote.java index f5746ca65f5e..705bae4f24ef 100644 --- a/core/java/com/android/internal/os/Zygote.java +++ b/core/java/com/android/internal/os/Zygote.java @@ -82,6 +82,11 @@ public final class Zygote { /** Read-write external storage should be mounted. */ public static final int MOUNT_EXTERNAL_WRITE = IVold.REMOUNT_MODE_WRITE; /** + * Mount mode for apps that are already installed on the device before the isolated_storage + * feature is enabled. + */ + public static final int MOUNT_EXTERNAL_LEGACY = IVold.REMOUNT_MODE_LEGACY; + /** * Mount mode for package installers which should give them access to * all obb dirs in addition to their package sandboxes */ diff --git a/core/java/com/android/internal/os/ZygoteConnection.java b/core/java/com/android/internal/os/ZygoteConnection.java index 5990d72d89b4..ced798cb6445 100644 --- a/core/java/com/android/internal/os/ZygoteConnection.java +++ b/core/java/com/android/internal/os/ZygoteConnection.java @@ -688,8 +688,10 @@ class ZygoteConnection { mountExternal = Zygote.MOUNT_EXTERNAL_WRITE; } else if (arg.equals("--mount-external-full")) { mountExternal = Zygote.MOUNT_EXTERNAL_FULL; - } else if (arg.equals("--mount-external-installer")) { + } else if (arg.equals("--mount-external-installer")) { mountExternal = Zygote.MOUNT_EXTERNAL_INSTALLER; + } else if (arg.equals("--mount-external-legacy")) { + mountExternal = Zygote.MOUNT_EXTERNAL_LEGACY; } else if (arg.equals("--query-abi-list")) { abiListQuery = true; } else if (arg.equals("--get-pid")) { |