A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.
fix(service): release wakelock and stop foreground when start fails
ExTv9bee010e82a6
diff --git a/app/src/main/java/com/excp/podroid/service/PodroidService.kt b/app/src/main/java/com/excp/podroid/service/PodroidService.ktindex 94f779d..e20dcb8 100644--- a/app/src/main/java/com/excp/podroid/service/PodroidService.kt+++ b/app/src/main/java/com/excp/podroid/service/PodroidService.kt@@ -7,6 +7,7 @@*/package com.excp.podroid.service+import android.Manifestimport android.annotation.SuppressLintimport android.app.Notificationimport android.app.NotificationChannel@@ -15,6 +16,7 @@ import android.app.PendingIntentimport android.app.Serviceimport android.content.Contextimport android.content.Intent+import android.content.pm.PackageManagerimport android.content.pm.ServiceInfoimport android.os.Buildimport android.os.IBinder@@ -22,6 +24,7 @@ import android.os.PowerManagerimport android.util.Logimport androidx.core.app.NotificationCompatimport androidx.core.app.ServiceCompat+import androidx.core.content.ContextCompatimport com.excp.podroid.MainActivityimport com.excp.podroid.PodroidApplicationimport com.excp.podroid.R@@ -70,6 +73,17 @@ class PodroidService : Service() {} else {0}+ // Non-fatal diagnostic: on API 33+ a missing POST_NOTIFICATIONS+ // grant makes the persistent notification (and its Stop action)+ // invisible while the WakeLock is held. We do NOT gate VM start on+ // this, just log so the invisible-notification state is+ // diagnosable. (The setup screen requests the permission.)+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&+ ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS)+ != PackageManager.PERMISSION_GRANTED) {+ Log.w(TAG, "POST_NOTIFICATIONS not granted; foreground notification " ++ "and its Stop action will be invisible while the VM holds the WakeLock")+ }// Always (re-)assert foreground within the start window — required// even on a redundant ACTION_START so the system doesn't fault us// for not calling startForeground.@@ -258,6 +272,17 @@ class PodroidService : Service() {engine.start(rules, config)} catch (e: Exception) {Log.e(TAG, "QEMU failed to start", e)+ // A Service-side throw here (failed asset extraction, a+ // snapshot read, or engine.start()) can happen before the+ // engine state ever leaves Idle. In that window the shutdown+ // observer's seenActive latch is still false, so its Idle+ // branch returns without teardown and nothing releases the+ // no-timeout WakeLock or drops the foreground notification.+ // Tear down here so a start failure cleans itself up.+ // teardown() is idempotent (releaseWakeLock guards on isHeld),+ // and this only runs on a thrown exception, never the success+ // path. Hop back to Main since teardown touches the service.+ withContext(Dispatchers.Main) { teardown() }}}}