A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.
refactor(avf): drop the obsolete Downloads-unavailable gating
ExTv4679cc01614e
diff --git a/app/src/main/java/com/excp/podroid/engine/avf/AvfDiagnostics.kt b/app/src/main/java/com/excp/podroid/engine/avf/AvfDiagnostics.ktindex a0e5591..a18c1a9 100644--- a/app/src/main/java/com/excp/podroid/engine/avf/AvfDiagnostics.kt+++ b/app/src/main/java/com/excp/podroid/engine/avf/AvfDiagnostics.kt@@ -80,32 +80,6 @@ object AvfDiagnostics {private const val CLS_CONFIG = "android.system.virtualmachine.VirtualMachineConfig"private const val CLS_CUSTOM_CFG = "android.system.virtualmachine.VirtualMachineCustomImageConfig"- /**- * Probe whether this AVF revision can share external storage paths- * (e.g. /storage/emulated/.../Download). The 10-param SharedPath ctor- * that takes a `boolean appDomain` is the prerequisite — without it,- * crosvm inherits our untrusted_app SELinux domain and the kernel- * refuses to read external storage (VM dies at start with reason=4).- *- * On shipping Pixel mustang beta, only the 9-param ctor ships and this- * returns false. Google's TerminalApp gets around it by being signed- * with the platform key and installed under /apex/com.android.virt/- * priv-app/ — a path no third-party APK can take.- */- fun externalStorageShareSupported(): Boolean {- val spCls = runCatching {- Class.forName("android.system.virtualmachine.VirtualMachineCustomImageConfig\$SharedPath")- }.getOrNull() ?: return false- val intT = Int::class.javaPrimitiveType!!- val boolT = Boolean::class.javaPrimitiveType!!- val strT = String::class.java- return runCatching {- spCls.getDeclaredConstructor(- strT, intT, intT, intT, intT, intT, strT, strT, boolT, strT- )- }.isSuccess- }-/*** True only if this device's AVF build exposes the custom-VM builder API* Podroid drives (raw kernel + initrd). A vendor build that ships AVF fordiff --git a/app/src/main/java/com/excp/podroid/ui/screens/backup/ContainerBackupScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/backup/ContainerBackupScreen.ktindex 6e0245b..fb69c77 100644--- a/app/src/main/java/com/excp/podroid/ui/screens/backup/ContainerBackupScreen.kt+++ b/app/src/main/java/com/excp/podroid/ui/screens/backup/ContainerBackupScreen.kt@@ -85,7 +85,7 @@ fun ContainerBackupScreen(value = ui.guestPath,mono = true,)- if (ui.storageAccessEnabled && ui.downloadsShareAvailable) {+ if (ui.storageAccessEnabled) {PodroidListRow(label = stringResource(R.string.container_backup_phone_path),value = stringResource(R.string.container_backup_phone_path_value),@@ -93,10 +93,7 @@ fun ContainerBackupScreen()} else {Text(- text = stringResource(- if (!ui.downloadsShareAvailable) R.string.container_backup_avf_hint- else R.string.container_backup_downloads_hint,- ),+ text = stringResource(R.string.container_backup_downloads_hint),style = MaterialTheme.typography.bodySmall,color = PodroidTokens.Amber,)diff --git a/app/src/main/java/com/excp/podroid/ui/screens/backup/ContainerBackupViewModel.kt b/app/src/main/java/com/excp/podroid/ui/screens/backup/ContainerBackupViewModel.ktindex 3e04622..83bd862 100644--- a/app/src/main/java/com/excp/podroid/ui/screens/backup/ContainerBackupViewModel.kt+++ b/app/src/main/java/com/excp/podroid/ui/screens/backup/ContainerBackupViewModel.kt@@ -22,7 +22,6 @@ import javax.inject.Injectdata class ContainerBackupUiState(val vmRunning: Boolean = false,val storageAccessEnabled: Boolean = false,- val downloadsShareAvailable: Boolean = true,val guestPath: String = "/var/backups/podroid",val backupFiles: List<ContainerBackupFile> = emptyList(),val containerName: String = "",@@ -51,7 +50,6 @@ class ContainerBackupViewModel @Inject constructor(ContainerBackupUiState(vmRunning = vmState is VmState.Running,storageAccessEnabled = storageAccess,- downloadsShareAvailable = engine.backendId == "qemu",guestPath = repository.guestBackupPathLabel(),backupFiles = files,containerName = container,diff --git a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.ktindex 101f898..8eaec9d 100644--- a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.kt+++ b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.kt@@ -132,7 +132,6 @@ fun SettingsScreen(// Memoize: both values are constant for the process lifetime / until a backend// swap, so there's no point re-running reflection on every recomposition.- val isDownloadsShareAvailable = remember { viewModel.isDownloadsShareAvailable() }val isUsbPassthroughAvailable = remember { viewModel.isUsbPassthroughAvailable() }val activeBackendId = remember { viewModel.activeBackendId() }@@ -291,8 +290,6 @@ fun SettingsScreen(DownloadsSharingRow(enabled = ui.storageAccessEnabled,vmNotRunning = vmNotRunning,- available = isDownloadsShareAvailable,- activeBackendId = activeBackendId,onToggle = { viewModel.setStorageAccessEnabled(it) },)PodroidListRow(@@ -567,19 +564,15 @@ private fun PortForwardSection(* Mirrors the setup wizard's storage-access toggle: turn it on and, if needed,* jump straight to the system MANAGE_EXTERNAL_STORAGE grant screen.*- * Disabled when the active backend can't actually share Downloads — on AVF- * that's any pKVM device whose framework jar ships only the 9-param- * SharedPath ctor (no `appDomain` parameter). Google's TerminalApp escapes- * this because it's installed as a privileged system app under- * /apex/com.android.virt/priv-app/; third-party APKs can't get the SELinux- * promotion needed to cross-domain-share external storage.+ * Works on both backends: QEMU shares Downloads via in-process virtio-9p, AVF+ * via an in-process 9p2000.L server the guest mounts over vsock+ * (AvfDownloadsShare) — no SharedPath, no privileged system-app install needed.+ * Only gated on the VM being stopped, since the share is wired up at boot.*/@Composableprivate fun DownloadsSharingRow(enabled: Boolean,vmNotRunning: Boolean,- available: Boolean,- activeBackendId: String,onToggle: (Boolean) -> Unit,) {val context = LocalContext.current@@ -600,7 +593,7 @@ private fun DownloadsSharingRow(label = stringResource(R.string.downloads_sharing),rightSlot = {PodroidSwitch(- checked = enabled && available,+ checked = enabled,onCheckedChange = { checked ->onToggle(checked)if (checked) {@@ -615,22 +608,10 @@ private fun DownloadsSharingRow(}}},- enabled = vmNotRunning && available,+ enabled = vmNotRunning,)},)- if (!available) {- Text(- text = stringResource(R.string.downloads_sharing_unavailable, activeBackendId),- style = MaterialTheme.typography.bodySmall,- color = MaterialTheme.colorScheme.onSurfaceVariant,- modifier = Modifier.padding(- start = PodroidTokens.Spacing.MD,- end = PodroidTokens.Spacing.MD,- bottom = PodroidTokens.Spacing.SM,- ),- )- }}/**diff --git a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsViewModel.kt b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsViewModel.ktindex 12c96ad..c12a242 100644--- a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsViewModel.kt+++ b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsViewModel.kt@@ -290,20 +290,6 @@ class SettingsViewModel @Inject constructor(/** Returns the ID string of the currently active VM backend (e.g. "qemu" or "avf"). */fun activeBackendId(): String = engine.backendId- /**- * True if Downloads sharing actually works on the currently-active backend.- * QEMU's virtio-9p path always works (it runs as part of our process and- * doesn't cross SELinux domains). AVF requires the 10-param `SharedPath`- * ctor with `appDomain=false` so crosvm can spin up in virtmgr's system- * domain and read /storage/emulated/... — without it the VM crashes at- * start. Shipping Pixel mustang beta has the 9-param ctor only, so AVF- * Downloads sharing is effectively unavailable to third-party apps there.- */- fun isDownloadsShareAvailable(): Boolean = when (engine.backendId) {- "avf" -> com.excp.podroid.engine.avf.AvfDiagnostics.externalStorageShareSupported()- else -> true- }-/*** USB passthrough rides the QEMU QMP control socket (add-fd + device_add* usb-host); the AVF backend has no QMP channel, so it can never pass a