Rename VmConfigJson to ConfigJson
... because the package it belongs to gives readers the context "vm".
Bug: N/A
Test: N/A
Change-Id: Ic1409d913c42addedadada1c110593391e60bb6d
diff --git a/android/VmLauncherApp/java/com/android/virtualization/vmlauncher/VmConfigJson.java b/android/VmLauncherApp/java/com/android/virtualization/vmlauncher/ConfigJson.java
similarity index 98%
rename from android/VmLauncherApp/java/com/android/virtualization/vmlauncher/VmConfigJson.java
rename to android/VmLauncherApp/java/com/android/virtualization/vmlauncher/ConfigJson.java
index 8116743..6d39b46 100644
--- a/android/VmLauncherApp/java/com/android/virtualization/vmlauncher/VmConfigJson.java
+++ b/android/VmLauncherApp/java/com/android/virtualization/vmlauncher/ConfigJson.java
@@ -36,10 +36,10 @@
import java.util.Arrays;
/** This class and its inner classes model vm_config.json. */
-class VmConfigJson {
+class ConfigJson {
private static final boolean DEBUG = true;
- private VmConfigJson() {}
+ private ConfigJson() {}
@SerializedName("protected")
private boolean isProtected;
@@ -64,9 +64,9 @@
private GpuJson gpu;
/** Parses JSON file at jsonPath */
- static VmConfigJson from(String jsonPath) {
+ static ConfigJson from(String jsonPath) {
try (FileReader r = new FileReader(jsonPath)) {
- return new Gson().fromJson(r, VmConfigJson.class);
+ return new Gson().fromJson(r, ConfigJson.class);
} catch (Exception e) {
throw new RuntimeException("Failed to parse " + jsonPath, e);
}
diff --git a/android/VmLauncherApp/java/com/android/virtualization/vmlauncher/MainActivity.java b/android/VmLauncherApp/java/com/android/virtualization/vmlauncher/MainActivity.java
index 160140a..fa67d96 100644
--- a/android/VmLauncherApp/java/com/android/virtualization/vmlauncher/MainActivity.java
+++ b/android/VmLauncherApp/java/com/android/virtualization/vmlauncher/MainActivity.java
@@ -212,7 +212,7 @@
try {
VirtualMachineConfig config =
- VmConfigJson.from("/data/local/tmp/vm_config.json").toConfig(this);
+ ConfigJson.from("/data/local/tmp/vm_config.json").toConfig(this);
VirtualMachineManager vmm =
getApplication().getSystemService(VirtualMachineManager.class);
if (vmm == null) {
diff --git a/android/VmLauncherApp/proguard.flags b/android/VmLauncherApp/proguard.flags
index 5e05ecf..13ec24e 100644
--- a/android/VmLauncherApp/proguard.flags
+++ b/android/VmLauncherApp/proguard.flags
@@ -1,7 +1,7 @@
# Keep the no-args constructor of the deserialized class
--keepclassmembers class com.android.virtualization.vmlauncher.VmConfigJson {
+-keepclassmembers class com.android.virtualization.vmlauncher.ConfigJson {
<init>();
}
--keepclassmembers class com.android.virtualization.vmlauncher.VmConfigJson$* {
+-keepclassmembers class com.android.virtualization.vmlauncher.ConfigJson$* {
<init>();
}