Skip to content

🧪 Regression Guard: Fix service cleanup crashes #683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yuga-hashimoto wants to merge 1 commit into
base: main
Choose a base branch
from
Open

🧪 Regression Guard: Fix service cleanup crashes #683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions app/src/main/java/com/openclaw/assistant/service/HotwordService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,18 @@ class HotwordService : Service(), VoskRecognitionListener {
}
} catch (e: IllegalStateException) {
Log.e(TAG, "Background execution limits prevented starting HotwordService: ${e.message}", e)
context.stopService(intent)
try {
context.stopService(intent)
} catch (e2: Exception) {
Log.e(TAG, "Failed to stopService in IllegalStateException handler", e2)
}
} catch (e: SecurityException) {
Log.e(TAG, "Security limits prevented starting HotwordService: ${e.message}", e)
context.stopService(intent)
try {
context.stopService(intent)
} catch (e2: Exception) {
Log.e(TAG, "Failed to stopService in SecurityException handler", e2)
}
} catch (e: Exception) {
Log.e(TAG, "Failed to start HotwordService: ${e.message}", e)
}
Expand Down
12 changes: 10 additions & 2 deletions app/src/main/java/com/openclaw/assistant/service/NodeForegroundService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,10 +285,18 @@ class NodeForegroundService : Service() {
context.startService(intent)
} catch (e: IllegalStateException) {
android.util.Log.w(TAG, "Failed to send ACTION_STOP via startService, falling back to stopService", e)
context.stopService(intent)
try {
context.stopService(intent)
} catch (stopEx: Exception) {
android.util.Log.e(TAG, "Failed to stopService in IllegalStateException handler", stopEx)
}
} catch (e: SecurityException) {
android.util.Log.w(TAG, "Failed to send ACTION_STOP via startService, falling back to stopService", e)
context.stopService(intent)
try {
context.stopService(intent)
} catch (stopEx: Exception) {
android.util.Log.e(TAG, "Failed to stopService in SecurityException handler", stopEx)
}
} catch (e: Exception) {
android.util.Log.w(TAG, "Failed to send ACTION_STOP via startService, falling back to stopService", e)
try {
Expand Down
12 changes: 10 additions & 2 deletions app/src/main/java/com/openclaw/assistant/service/SessionForegroundService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,18 @@ class SessionForegroundService : Service() {
}
} catch (e: IllegalStateException) {
Log.e(TAG, "Background execution limits prevented starting SessionForegroundService: ${e.message}", e)
context.stopService(intent)
try {
context.stopService(intent)
} catch (e2: Exception) {
Log.e(TAG, "Failed to stopService in IllegalStateException handler", e2)
}
} catch (e: SecurityException) {
Log.e(TAG, "Security limits prevented starting SessionForegroundService: ${e.message}", e)
context.stopService(intent)
try {
context.stopService(intent)
} catch (e2: Exception) {
Log.e(TAG, "Failed to stopService in SecurityException handler", e2)
}
} catch (e: Exception) {
Log.e(TAG, "Failed to start SessionForegroundService: ${e.message}", e)
}
Expand Down
Loading