Merge "Fix icons in dark mode" into main
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/InstallerService.java b/android/TerminalApp/java/com/android/virtualization/terminal/InstallerService.java
index b3102db..6737d49 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/InstallerService.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/InstallerService.java
@@ -206,7 +206,7 @@
notifyError(getString(R.string.installer_error_unknown));
return false;
}
- return true;
+ return InstallUtils.createInstalledMarker(this);
}
private void notifyError(String displayText) {
diff --git a/build/debian/fai_config/files/etc/default/grub.d/15_timeout.cfg/AVF b/build/debian/fai_config/files/etc/default/grub.d/15_timeout.cfg/AVF
new file mode 100644
index 0000000..bc3e4d9
--- /dev/null
+++ b/build/debian/fai_config/files/etc/default/grub.d/15_timeout.cfg/AVF
@@ -0,0 +1 @@
+GRUB_TIMEOUT=0
diff --git a/build/debian/fai_config/files/etc/systemd/system/ttyd.service/AVF b/build/debian/fai_config/files/etc/systemd/system/ttyd.service/AVF
index 0aab770..5c7ff9c 100644
--- a/build/debian/fai_config/files/etc/systemd/system/ttyd.service/AVF
+++ b/build/debian/fai_config/files/etc/systemd/system/ttyd.service/AVF
@@ -3,7 +3,7 @@
After=syslog.target
After=network.target
[Service]
-ExecStart=/usr/local/bin/ttyd --ssl --ssl-cert /etc/ttyd/server.crt --ssl-key /etc/ttyd/server.key --ssl-ca /etc/ttyd/ca.crt -W screen -aAxR -S main login -f droid
+ExecStart=/usr/local/bin/ttyd --ssl --ssl-cert /etc/ttyd/server.crt --ssl-key /etc/ttyd/server.key --ssl-ca /etc/ttyd/ca.crt -W login -f droid
Type=simple
Restart=always
User=root
diff --git a/build/debian/fai_config/scripts/AVF/20-useradd b/build/debian/fai_config/scripts/AVF/20-useradd
index 9fbcd43..1c93772 100755
--- a/build/debian/fai_config/scripts/AVF/20-useradd
+++ b/build/debian/fai_config/scripts/AVF/20-useradd
@@ -1,4 +1,4 @@
#!/bin/bash
-$ROOTCMD useradd -m -u 1000 -N -G sudo droid
-$ROOTCMD echo 'droid ALL=(ALL) NOPASSWD:ALL' >> $target/etc/sudoers
\ No newline at end of file
+$ROOTCMD useradd -m -u 1000 -N -G sudo -s /usr/bin/bash droid
+$ROOTCMD echo 'droid ALL=(ALL) NOPASSWD:ALL' >> $target/etc/sudoers
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 17dc8dd..a4e7809 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
@@ -49,6 +49,16 @@
return Files.exists(getInstallationCompletedPath(context));
}
+ public static boolean createInstalledMarker(Context context) {
+ try {
+ File file = new File(getInstallationCompletedPath(context).toString());
+ return file.createNewFile();
+ } catch (IOException e) {
+ Log.e(TAG, "Failed to mark install completed", e);
+ return false;
+ }
+ }
+
private static Path getPayloadPath() {
File payloadDir = Environment.getExternalStoragePublicDirectory(PAYLOAD_DIR);
if (payloadDir == null) {
@@ -114,14 +124,7 @@
}
// Create marker for installation done.
- try {
- File file = new File(getInstallationCompletedPath(context).toString());
- file.createNewFile();
- } catch (IOException e) {
- Log.e(TAG, "Failed to mark install completed", e);
- return false;
- }
- return true;
+ return createInstalledMarker(context);
}
private static Function<String, String> getReplacer(Context context) {