dilim/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-08-07 10:34:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

android: mark manual mic as microphone foreground service

Browse Source
This commit is contained in:
joshavant
2026-06-18 17:48:59 +02:00
parent ba779d8367
commit 8ab36e4308
4 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/android/app/src/main/java/ai/openclaw/app/NodeForegroundService.kt
View File

@@ -223,10 +223,11 @@ class NodeForegroundService : Service() {
internal fun foregroundServiceTypesForVoiceMode(mode: VoiceCaptureMode): Int {
val base = ServiceInfo.FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE
return if (mode == VoiceCaptureMode.TalkMode) {
base or ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE
} else {
base
return when (mode) {
VoiceCaptureMode.Off -> base
VoiceCaptureMode.ManualMic,
VoiceCaptureMode.TalkMode,
-> base or ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE
}
}

6
apps/android/app/src/main/java/ai/openclaw/app/NodeRuntime.kt
View File

@@ -1396,8 +1396,9 @@ class NodeRuntime(
mode: VoiceCaptureMode,
persistManualMic: Boolean = true,
) {
if (mode == VoiceCaptureMode.TalkMode && !hasRecordAudioPermission()) {
if (mode.requiresMicrophonePermission && !hasRecordAudioPermission()) {
_voiceCaptureMode.value = VoiceCaptureMode.Off
prefs.setVoiceMicEnabled(false)
externalAudioCaptureActive.value = false
return
}
@@ -1468,6 +1469,9 @@ class NodeRuntime(
}
}
private val VoiceCaptureMode.requiresMicrophonePermission: Boolean
get() = this == VoiceCaptureMode.ManualMic || this == VoiceCaptureMode.TalkMode
fun refreshGatewayConnection() {
val endpoint = connectedEndpoint
if (endpoint == null) {

19
apps/android/app/src/test/java/ai/openclaw/app/GatewayBootstrapAuthTest.kt
View File

@@ -376,6 +376,25 @@ class GatewayBootstrapAuthTest {
assertNull(authStore.loadToken(deviceId, "operator"))
}
@Test
fun restoredManualMicWithoutRecordAudioClearsStalePreference() {
val app = RuntimeEnvironment.getApplication()
shadowOf(app).denyPermissions(Manifest.permission.RECORD_AUDIO)
val securePrefs =
app.getSharedPreferences(
"openclaw.node.secure.test.${UUID.randomUUID()}",
android.content.Context.MODE_PRIVATE,
)
val prefs = SecurePrefs(app, securePrefsOverride = securePrefs)
prefs.setVoiceMicEnabled(true)
val runtime = NodeRuntime(app, prefs)
assertEquals(VoiceCaptureMode.Off, runtime.voiceCaptureMode.value)
assertFalse(prefs.voiceMicEnabled.value)
assertFalse(readField<MutableStateFlow<Boolean>>(runtime, "externalAudioCaptureActive").value)
}
@Test
fun talkPttStart_cleansPreparedCaptureWhenBeginFails() =
runBlocking {

4
apps/android/app/src/test/java/ai/openclaw/app/NodeForegroundServiceTest.kt
View File

@@ -32,13 +32,13 @@ class NodeForegroundServiceTest {
}
@Test
fun foregroundServiceTypesForVoiceMode_addsMicrophoneOnlyForTalkMode() {
fun foregroundServiceTypesForVoiceMode_addsMicrophoneForActiveCaptureModes() {
assertEquals(
ServiceInfo.FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE,
foregroundServiceTypesForVoiceMode(VoiceCaptureMode.Off),
)
assertEquals(
ServiceInfo.FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE,
ServiceInfo.FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE or ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE,
foregroundServiceTypesForVoiceMode(VoiceCaptureMode.ManualMic),
)
assertEquals(