| commit | b305dec030c9e5aace0d8656976ebf7fea4897e3 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Jun 19 14:52:46 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 19 14:52:46 2024 +0000 |
| tree | 6fbc33ee9d57534e20eabeaf0367b869e287c159 | |
| parent | 2e5c325c1e3777ff9f75060dc5aba23d4c2e9cbc [diff] | |
| parent | 868c4dd769acd51dc0318ae4ca7647d9f0c5d8e7 [diff] |
Merge "Always update vm_config.json" into main am: d3d155d319 am: 868c4dd769 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3139089 Change-Id: I9bc03efdf17fdf9f707ef0ab8ea9f1965af73344 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/ferrochrome_app/java/com/android/virtualization/ferrochrome/FerrochromeActivity.java b/ferrochrome_app/java/com/android/virtualization/ferrochrome/FerrochromeActivity.java index 71a9ff8..d4365a7 100644 --- a/ferrochrome_app/java/com/android/virtualization/ferrochrome/FerrochromeActivity.java +++ b/ferrochrome_app/java/com/android/virtualization/ferrochrome/FerrochromeActivity.java
@@ -129,9 +129,6 @@ } private void copyVmConfigJson() { - if (Files.exists(VM_CONFIG_PATH)) { - return; - } try (InputStream is = getResources().openRawResource(R.raw.vm_config)) { Files.copy(is, VM_CONFIG_PATH, StandardCopyOption.REPLACE_EXISTING); } catch (IOException e) {