| commit | b63d2dcd1d8c51b150fab6894f3df1f6079fa9f4 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Dec 06 01:24:04 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 06 01:24:04 2024 +0000 |
| tree | 340c94cf686b74cfbbc04d666455769556b52d2a | |
| parent | 12ec54493c7ce5ab631d940817287c7b7f41d521 [diff] | |
| parent | a1df08675d3df8e3ddee144909146b58f44dd929 [diff] |
Merge "Remove hack on APP_DATA_DIR" into main am: a1df08675d Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3391934 Change-Id: I7ace553c39f6dba5e48d2d1e9fa435dc1661e0c0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/ConfigJson.java b/android/TerminalApp/java/com/android/virtualization/terminal/ConfigJson.java index bd1af49..b79e346 100644 --- a/android/TerminalApp/java/com/android/virtualization/terminal/ConfigJson.java +++ b/android/TerminalApp/java/com/android/virtualization/terminal/ConfigJson.java
@@ -92,12 +92,7 @@ rules.put("\\$PAYLOAD_DIR", InstalledImage.getDefault(context).getInstallDir().toString()); rules.put("\\$USER_ID", String.valueOf(context.getUserId())); rules.put("\\$PACKAGE_NAME", context.getPackageName()); - String appDataDir = context.getDataDir().toString(); - // TODO: remove this hack - if (context.getUserId() == 0) { - appDataDir = "/data/data/" + context.getPackageName(); - } - rules.put("\\$APP_DATA_DIR", appDataDir); + rules.put("\\$APP_DATA_DIR", context.getDataDir().toString()); try (BufferedReader br = new BufferedReader(r)) { return br.lines()