Use /data/user/<user_id>/<package_name> directory
Bug: 377067518
Test: run terminal app on HSUM devices
Change-Id: I5bcc91733347205ba2c876654c2922dcc9334d9a
diff --git a/build/debian/vm_config.json.aarch64 b/build/debian/vm_config.json.aarch64
index f31c5b7..8e16093 100644
--- a/build/debian/vm_config.json.aarch64
+++ b/build/debian/vm_config.json.aarch64
@@ -12,7 +12,7 @@
"sharedPath": "/storage/emulated"
},
{
- "sharedPath": "/data/data/$PACKAGE_NAME/files"
+ "sharedPath": "/data/user/$USER_ID/$PACKAGE_NAME/files"
}
],
"protected": false,
diff --git a/build/debian/vm_config.json.x86_64 b/build/debian/vm_config.json.x86_64
index 12f99c3..09e04b9 100644
--- a/build/debian/vm_config.json.x86_64
+++ b/build/debian/vm_config.json.x86_64
@@ -12,7 +12,7 @@
"sharedPath": "/storage/emulated"
},
{
- "sharedPath": "/data/data/$PACKAGE_NAME/files"
+ "sharedPath": "/data/user/$USER_ID/$PACKAGE_NAME/files"
}
],
"kernel": "$PAYLOAD_DIR/vmlinuz",
diff --git a/libs/vm_launcher_lib/java/com/android/virtualization/vmlauncher/InstallUtils.java b/libs/vm_launcher_lib/java/com/android/virtualization/vmlauncher/InstallUtils.java
index bc39a23..0e46a63 100644
--- a/libs/vm_launcher_lib/java/com/android/virtualization/vmlauncher/InstallUtils.java
+++ b/libs/vm_launcher_lib/java/com/android/virtualization/vmlauncher/InstallUtils.java
@@ -139,6 +139,7 @@
private static Function<String, String> getReplacer(Context context) {
Map<String, String> rules = new HashMap<>();
rules.put("\\$PAYLOAD_DIR", new File(context.getFilesDir(), PAYLOAD_DIR).toString());
+ rules.put("\\$USER_ID", String.valueOf(context.getUserId()));
rules.put("\\$PACKAGE_NAME", context.getPackageName());
return (s) -> {
for (Map.Entry<String, String> rule : rules.entrySet()) {