From f09f98532cfe9c8344d794a7d8cf1c30158aa6e1 Mon Sep 17 00:00:00 2001 From: Ayaan Zaidi Date: Fri, 20 Mar 2026 12:44:28 +0530 Subject: [PATCH] feat(android): hide restricted capabilities in play builds --- .../main/java/ai/openclaw/app/NodeRuntime.kt | 12 ++-- .../ai/openclaw/app/node/ConnectionManager.kt | 2 + .../ai/openclaw/app/node/DeviceHandler.kt | 10 ++-- .../app/node/InvokeCommandRegistry.kt | 11 +++- .../ai/openclaw/app/node/InvokeDispatcher.kt | 10 ++++ .../java/ai/openclaw/app/ui/OnboardingFlow.kt | 49 ++++++++++------ .../java/ai/openclaw/app/ui/SettingsSheet.kt | 56 ++++++++++--------- .../app/node/InvokeCommandRegistryTest.kt | 23 +++++++- 8 files changed, 118 insertions(+), 55 deletions(-) diff --git a/apps/android/app/src/main/java/ai/openclaw/app/NodeRuntime.kt b/apps/android/app/src/main/java/ai/openclaw/app/NodeRuntime.kt index 6dd1b83d3bb..0149aa9d09b 100644 --- a/apps/android/app/src/main/java/ai/openclaw/app/NodeRuntime.kt +++ b/apps/android/app/src/main/java/ai/openclaw/app/NodeRuntime.kt @@ -89,6 +89,8 @@ class NodeRuntime( private val deviceHandler: DeviceHandler = DeviceHandler( appContext = appContext, + smsEnabled = BuildConfig.OPENCLAW_ENABLE_SMS, + callLogEnabled = BuildConfig.OPENCLAW_ENABLE_CALL_LOG, ) private val notificationsHandler: NotificationsHandler = NotificationsHandler( @@ -137,8 +139,9 @@ class NodeRuntime( voiceWakeMode = { VoiceWakeMode.Off }, motionActivityAvailable = { motionHandler.isActivityAvailable() }, motionPedometerAvailable = { motionHandler.isPedometerAvailable() }, - sendSmsAvailable = { sms.canSendSms() }, - readSmsAvailable = { sms.canReadSms() }, + sendSmsAvailable = { BuildConfig.OPENCLAW_ENABLE_SMS && sms.canSendSms() }, + readSmsAvailable = { BuildConfig.OPENCLAW_ENABLE_SMS && sms.canReadSms() }, + callLogAvailable = { BuildConfig.OPENCLAW_ENABLE_CALL_LOG }, hasRecordAudioPermission = { hasRecordAudioPermission() }, manualTls = { manualTls.value }, ) @@ -161,8 +164,9 @@ class NodeRuntime( isForeground = { _isForeground.value }, cameraEnabled = { cameraEnabled.value }, locationEnabled = { locationMode.value != LocationMode.Off }, - sendSmsAvailable = { sms.canSendSms() }, - readSmsAvailable = { sms.canReadSms() }, + sendSmsAvailable = { BuildConfig.OPENCLAW_ENABLE_SMS && sms.canSendSms() }, + readSmsAvailable = { BuildConfig.OPENCLAW_ENABLE_SMS && sms.canReadSms() }, + callLogAvailable = { BuildConfig.OPENCLAW_ENABLE_CALL_LOG }, debugBuild = { BuildConfig.DEBUG }, refreshNodeCanvasCapability = { nodeSession.refreshNodeCanvasCapability() }, onCanvasA2uiPush = { diff --git a/apps/android/app/src/main/java/ai/openclaw/app/node/ConnectionManager.kt b/apps/android/app/src/main/java/ai/openclaw/app/node/ConnectionManager.kt index ce9c9d77bfc..d58049c6059 100644 --- a/apps/android/app/src/main/java/ai/openclaw/app/node/ConnectionManager.kt +++ b/apps/android/app/src/main/java/ai/openclaw/app/node/ConnectionManager.kt @@ -19,6 +19,7 @@ class ConnectionManager( private val motionPedometerAvailable: () -> Boolean, private val sendSmsAvailable: () -> Boolean, private val readSmsAvailable: () -> Boolean, + private val callLogAvailable: () -> Boolean, private val hasRecordAudioPermission: () -> Boolean, private val manualTls: () -> Boolean, ) { @@ -81,6 +82,7 @@ class ConnectionManager( locationEnabled = locationMode() != LocationMode.Off, sendSmsAvailable = sendSmsAvailable(), readSmsAvailable = readSmsAvailable(), + callLogAvailable = callLogAvailable(), voiceWakeEnabled = voiceWakeMode() != VoiceWakeMode.Off && hasRecordAudioPermission(), motionActivityAvailable = motionActivityAvailable(), motionPedometerAvailable = motionPedometerAvailable(), diff --git a/apps/android/app/src/main/java/ai/openclaw/app/node/DeviceHandler.kt b/apps/android/app/src/main/java/ai/openclaw/app/node/DeviceHandler.kt index b888e3edaea..ad80d75f257 100644 --- a/apps/android/app/src/main/java/ai/openclaw/app/node/DeviceHandler.kt +++ b/apps/android/app/src/main/java/ai/openclaw/app/node/DeviceHandler.kt @@ -25,6 +25,8 @@ import kotlinx.serialization.json.put class DeviceHandler( private val appContext: Context, + private val smsEnabled: Boolean = BuildConfig.OPENCLAW_ENABLE_SMS, + private val callLogEnabled: Boolean = BuildConfig.OPENCLAW_ENABLE_CALL_LOG, ) { private data class BatterySnapshot( val status: Int, @@ -173,8 +175,8 @@ class DeviceHandler( put( "sms", permissionStateJson( - granted = hasPermission(Manifest.permission.SEND_SMS) && canSendSms, - promptableWhenDenied = canSendSms, + granted = smsEnabled && hasPermission(Manifest.permission.SEND_SMS) && canSendSms, + promptableWhenDenied = smsEnabled && canSendSms, ), ) put( @@ -215,8 +217,8 @@ class DeviceHandler( put( "callLog", permissionStateJson( - granted = hasPermission(Manifest.permission.READ_CALL_LOG), - promptableWhenDenied = true, + granted = callLogEnabled && hasPermission(Manifest.permission.READ_CALL_LOG), + promptableWhenDenied = callLogEnabled, ), ) put( diff --git a/apps/android/app/src/main/java/ai/openclaw/app/node/InvokeCommandRegistry.kt b/apps/android/app/src/main/java/ai/openclaw/app/node/InvokeCommandRegistry.kt index 3e903098196..6c755830a24 100644 --- a/apps/android/app/src/main/java/ai/openclaw/app/node/InvokeCommandRegistry.kt +++ b/apps/android/app/src/main/java/ai/openclaw/app/node/InvokeCommandRegistry.kt @@ -20,6 +20,7 @@ data class NodeRuntimeFlags( val locationEnabled: Boolean, val sendSmsAvailable: Boolean, val readSmsAvailable: Boolean, + val callLogAvailable: Boolean, val voiceWakeEnabled: Boolean, val motionActivityAvailable: Boolean, val motionPedometerAvailable: Boolean, @@ -32,6 +33,7 @@ enum class InvokeCommandAvailability { LocationEnabled, SendSmsAvailable, ReadSmsAvailable, + CallLogAvailable, MotionActivityAvailable, MotionPedometerAvailable, DebugBuild, @@ -42,6 +44,7 @@ enum class NodeCapabilityAvailability { CameraEnabled, LocationEnabled, SmsAvailable, + CallLogAvailable, VoiceWakeEnabled, MotionAvailable, } @@ -87,7 +90,10 @@ object InvokeCommandRegistry { name = OpenClawCapability.Motion.rawValue, availability = NodeCapabilityAvailability.MotionAvailable, ), - NodeCapabilitySpec(name = OpenClawCapability.CallLog.rawValue), + NodeCapabilitySpec( + name = OpenClawCapability.CallLog.rawValue, + availability = NodeCapabilityAvailability.CallLogAvailable, + ), ) val all: List = @@ -197,6 +203,7 @@ object InvokeCommandRegistry { ), InvokeCommandSpec( name = OpenClawCallLogCommand.Search.rawValue, + availability = InvokeCommandAvailability.CallLogAvailable, ), InvokeCommandSpec( name = "debug.logs", @@ -220,6 +227,7 @@ object InvokeCommandRegistry { NodeCapabilityAvailability.CameraEnabled -> flags.cameraEnabled NodeCapabilityAvailability.LocationEnabled -> flags.locationEnabled NodeCapabilityAvailability.SmsAvailable -> flags.sendSmsAvailable || flags.readSmsAvailable + NodeCapabilityAvailability.CallLogAvailable -> flags.callLogAvailable NodeCapabilityAvailability.VoiceWakeEnabled -> flags.voiceWakeEnabled NodeCapabilityAvailability.MotionAvailable -> flags.motionActivityAvailable || flags.motionPedometerAvailable } @@ -236,6 +244,7 @@ object InvokeCommandRegistry { InvokeCommandAvailability.LocationEnabled -> flags.locationEnabled InvokeCommandAvailability.SendSmsAvailable -> flags.sendSmsAvailable InvokeCommandAvailability.ReadSmsAvailable -> flags.readSmsAvailable + InvokeCommandAvailability.CallLogAvailable -> flags.callLogAvailable InvokeCommandAvailability.MotionActivityAvailable -> flags.motionActivityAvailable InvokeCommandAvailability.MotionPedometerAvailable -> flags.motionPedometerAvailable InvokeCommandAvailability.DebugBuild -> flags.debugBuild diff --git a/apps/android/app/src/main/java/ai/openclaw/app/node/InvokeDispatcher.kt b/apps/android/app/src/main/java/ai/openclaw/app/node/InvokeDispatcher.kt index 2ed0773bc43..17df029a5c6 100644 --- a/apps/android/app/src/main/java/ai/openclaw/app/node/InvokeDispatcher.kt +++ b/apps/android/app/src/main/java/ai/openclaw/app/node/InvokeDispatcher.kt @@ -34,6 +34,7 @@ class InvokeDispatcher( private val locationEnabled: () -> Boolean, private val sendSmsAvailable: () -> Boolean, private val readSmsAvailable: () -> Boolean, + private val callLogAvailable: () -> Boolean, private val debugBuild: () -> Boolean, private val refreshNodeCanvasCapability: suspend () -> Boolean, private val onCanvasA2uiPush: () -> Unit, @@ -276,6 +277,15 @@ class InvokeDispatcher( message = "SMS_UNAVAILABLE: SMS not available on this device", ) } + InvokeCommandAvailability.CallLogAvailable -> + if (callLogAvailable()) { + null + } else { + GatewaySession.InvokeResult.error( + code = "CALL_LOG_UNAVAILABLE", + message = "CALL_LOG_UNAVAILABLE: call log not available on this build", + ) + } InvokeCommandAvailability.DebugBuild -> if (debugBuild()) { null diff --git a/apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt b/apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt index 1f4774a537d..28a28e281c1 100644 --- a/apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt +++ b/apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt @@ -93,6 +93,7 @@ import androidx.core.content.ContextCompat import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleEventObserver import androidx.lifecycle.compose.LocalLifecycleOwner +import ai.openclaw.app.BuildConfig import ai.openclaw.app.LocationMode import ai.openclaw.app.MainViewModel import ai.openclaw.app.node.DeviceNotificationListenerService @@ -238,8 +239,10 @@ fun OnboardingFlow(viewModel: MainViewModel, modifier: Modifier = Modifier) { val smsAvailable = remember(context) { - context.packageManager?.hasSystemFeature(PackageManager.FEATURE_TELEPHONY) == true + BuildConfig.OPENCLAW_ENABLE_SMS && + context.packageManager?.hasSystemFeature(PackageManager.FEATURE_TELEPHONY) == true } + val callLogAvailable = remember { BuildConfig.OPENCLAW_ENABLE_CALL_LOG } val motionAvailable = remember(context) { hasMotionCapabilities(context) @@ -297,7 +300,7 @@ fun OnboardingFlow(viewModel: MainViewModel, modifier: Modifier = Modifier) { } var enableCallLog by rememberSaveable { - mutableStateOf(isPermissionGranted(context, Manifest.permission.READ_CALL_LOG)) + mutableStateOf(callLogAvailable && isPermissionGranted(context, Manifest.permission.READ_CALL_LOG)) } var pendingPermissionToggle by remember { mutableStateOf(null) } @@ -315,7 +318,7 @@ fun OnboardingFlow(viewModel: MainViewModel, modifier: Modifier = Modifier) { PermissionToggle.Calendar -> enableCalendar = enabled PermissionToggle.Motion -> enableMotion = enabled && motionAvailable PermissionToggle.Sms -> enableSms = enabled && smsAvailable - PermissionToggle.CallLog -> enableCallLog = enabled + PermissionToggle.CallLog -> enableCallLog = enabled && callLogAvailable } } @@ -345,7 +348,8 @@ fun OnboardingFlow(viewModel: MainViewModel, modifier: Modifier = Modifier) { !smsAvailable || (isPermissionGranted(context, Manifest.permission.SEND_SMS) && isPermissionGranted(context, Manifest.permission.READ_SMS)) - PermissionToggle.CallLog -> isPermissionGranted(context, Manifest.permission.READ_CALL_LOG) + PermissionToggle.CallLog -> + !callLogAvailable || isPermissionGranted(context, Manifest.permission.READ_CALL_LOG) } fun setSpecialAccessToggleEnabled(toggle: SpecialAccessToggle, enabled: Boolean) { @@ -369,6 +373,7 @@ fun OnboardingFlow(viewModel: MainViewModel, modifier: Modifier = Modifier) { enableSms, enableCallLog, smsAvailable, + callLogAvailable, motionAvailable, ) { val enabled = mutableListOf() @@ -383,7 +388,7 @@ fun OnboardingFlow(viewModel: MainViewModel, modifier: Modifier = Modifier) { if (enableCalendar) enabled += "Calendar" if (enableMotion && motionAvailable) enabled += "Motion" if (smsAvailable && enableSms) enabled += "SMS" - if (enableCallLog) enabled += "Call Log" + if (callLogAvailable && enableCallLog) enabled += "Call Log" if (enabled.isEmpty()) "None selected" else enabled.joinToString(", ") } @@ -612,6 +617,7 @@ fun OnboardingFlow(viewModel: MainViewModel, modifier: Modifier = Modifier) { motionPermissionRequired = motionPermissionRequired, enableSms = enableSms, smsAvailable = smsAvailable, + callLogAvailable = callLogAvailable, enableCallLog = enableCallLog, context = context, onDiscoveryChange = { checked -> @@ -711,11 +717,15 @@ fun OnboardingFlow(viewModel: MainViewModel, modifier: Modifier = Modifier) { } }, onCallLogChange = { checked -> - requestPermissionToggle( - PermissionToggle.CallLog, - checked, - listOf(Manifest.permission.READ_CALL_LOG), - ) + if (!callLogAvailable) { + setPermissionToggleEnabled(PermissionToggle.CallLog, false) + } else { + requestPermissionToggle( + PermissionToggle.CallLog, + checked, + listOf(Manifest.permission.READ_CALL_LOG), + ) + } }, ) OnboardingStep.FinalCheck -> @@ -1307,6 +1317,7 @@ private fun PermissionsStep( motionPermissionRequired: Boolean, enableSms: Boolean, smsAvailable: Boolean, + callLogAvailable: Boolean, enableCallLog: Boolean, context: Context, onDiscoveryChange: (Boolean) -> Unit, @@ -1453,14 +1464,16 @@ private fun PermissionsStep( onCheckedChange = onSmsChange, ) } - InlineDivider() - PermissionToggleRow( - title = "Call Log", - subtitle = "callLog.search", - checked = enableCallLog, - granted = isPermissionGranted(context, Manifest.permission.READ_CALL_LOG), - onCheckedChange = onCallLogChange, - ) + if (callLogAvailable) { + InlineDivider() + PermissionToggleRow( + title = "Call Log", + subtitle = "callLog.search", + checked = enableCallLog, + granted = isPermissionGranted(context, Manifest.permission.READ_CALL_LOG), + onCheckedChange = onCallLogChange, + ) + } Text("All settings can be changed later in Settings.", style = onboardingCalloutStyle, color = onboardingTextSecondary) } } diff --git a/apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsSheet.kt b/apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsSheet.kt index f78e4535bcb..e7ad138dc21 100644 --- a/apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsSheet.kt +++ b/apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsSheet.kt @@ -149,8 +149,10 @@ fun SettingsSheet(viewModel: MainViewModel) { val smsPermissionAvailable = remember { - context.packageManager?.hasSystemFeature(PackageManager.FEATURE_TELEPHONY) == true + BuildConfig.OPENCLAW_ENABLE_SMS && + context.packageManager?.hasSystemFeature(PackageManager.FEATURE_TELEPHONY) == true } + val callLogPermissionAvailable = remember { BuildConfig.OPENCLAW_ENABLE_CALL_LOG } val photosPermission = if (Build.VERSION.SDK_INT >= 33) { Manifest.permission.READ_MEDIA_IMAGES @@ -622,31 +624,33 @@ fun SettingsSheet(viewModel: MainViewModel) { } }, ) - HorizontalDivider(color = mobileBorder) - ListItem( - modifier = Modifier.fillMaxWidth(), - colors = listItemColors, - headlineContent = { Text("Call Log", style = mobileHeadline) }, - supportingContent = { Text("Search recent call history.", style = mobileCallout) }, - trailingContent = { - Button( - onClick = { - if (callLogPermissionGranted) { - openAppSettings(context) - } else { - callLogPermissionLauncher.launch(Manifest.permission.READ_CALL_LOG) - } - }, - colors = settingsPrimaryButtonColors(), - shape = RoundedCornerShape(14.dp), - ) { - Text( - if (callLogPermissionGranted) "Manage" else "Grant", - style = mobileCallout.copy(fontWeight = FontWeight.Bold), - ) - } - }, - ) + if (callLogPermissionAvailable) { + HorizontalDivider(color = mobileBorder) + ListItem( + modifier = Modifier.fillMaxWidth(), + colors = listItemColors, + headlineContent = { Text("Call Log", style = mobileHeadline) }, + supportingContent = { Text("Search recent call history.", style = mobileCallout) }, + trailingContent = { + Button( + onClick = { + if (callLogPermissionGranted) { + openAppSettings(context) + } else { + callLogPermissionLauncher.launch(Manifest.permission.READ_CALL_LOG) + } + }, + colors = settingsPrimaryButtonColors(), + shape = RoundedCornerShape(14.dp), + ) { + Text( + if (callLogPermissionGranted) "Manage" else "Grant", + style = mobileCallout.copy(fontWeight = FontWeight.Bold), + ) + } + }, + ) + } if (motionAvailable) { HorizontalDivider(color = mobileBorder) ListItem( diff --git a/apps/android/app/src/test/java/ai/openclaw/app/node/InvokeCommandRegistryTest.kt b/apps/android/app/src/test/java/ai/openclaw/app/node/InvokeCommandRegistryTest.kt index 29decd2f76d..08fc3f26eab 100644 --- a/apps/android/app/src/test/java/ai/openclaw/app/node/InvokeCommandRegistryTest.kt +++ b/apps/android/app/src/test/java/ai/openclaw/app/node/InvokeCommandRegistryTest.kt @@ -26,7 +26,6 @@ class InvokeCommandRegistryTest { OpenClawCapability.Photos.rawValue, OpenClawCapability.Contacts.rawValue, OpenClawCapability.Calendar.rawValue, - OpenClawCapability.CallLog.rawValue, ) private val optionalCapabilities = @@ -34,6 +33,7 @@ class InvokeCommandRegistryTest { OpenClawCapability.Camera.rawValue, OpenClawCapability.Location.rawValue, OpenClawCapability.Sms.rawValue, + OpenClawCapability.CallLog.rawValue, OpenClawCapability.VoiceWake.rawValue, OpenClawCapability.Motion.rawValue, ) @@ -52,7 +52,6 @@ class InvokeCommandRegistryTest { OpenClawContactsCommand.Add.rawValue, OpenClawCalendarCommand.Events.rawValue, OpenClawCalendarCommand.Add.rawValue, - OpenClawCallLogCommand.Search.rawValue, ) private val optionalCommands = @@ -65,6 +64,7 @@ class InvokeCommandRegistryTest { OpenClawMotionCommand.Pedometer.rawValue, OpenClawSmsCommand.Send.rawValue, OpenClawSmsCommand.Search.rawValue, + OpenClawCallLogCommand.Search.rawValue, ) private val debugCommands = setOf("debug.logs", "debug.ed25519") @@ -86,6 +86,7 @@ class InvokeCommandRegistryTest { locationEnabled = true, sendSmsAvailable = true, readSmsAvailable = true, + callLogAvailable = true, voiceWakeEnabled = true, motionActivityAvailable = true, motionPedometerAvailable = true, @@ -112,6 +113,7 @@ class InvokeCommandRegistryTest { locationEnabled = true, sendSmsAvailable = true, readSmsAvailable = true, + callLogAvailable = true, motionActivityAvailable = true, motionPedometerAvailable = true, debugBuild = true, @@ -130,6 +132,7 @@ class InvokeCommandRegistryTest { locationEnabled = false, sendSmsAvailable = false, readSmsAvailable = false, + callLogAvailable = false, voiceWakeEnabled = false, motionActivityAvailable = true, motionPedometerAvailable = false, @@ -173,11 +176,26 @@ class InvokeCommandRegistryTest { assertTrue(sendOnlyCapabilities.contains(OpenClawCapability.Sms.rawValue)) } + @Test + fun advertisedCommands_excludesCallLogWhenUnavailable() { + val commands = InvokeCommandRegistry.advertisedCommands(defaultFlags(callLogAvailable = false)) + + assertFalse(commands.contains(OpenClawCallLogCommand.Search.rawValue)) + } + + @Test + fun advertisedCapabilities_excludesCallLogWhenUnavailable() { + val capabilities = InvokeCommandRegistry.advertisedCapabilities(defaultFlags(callLogAvailable = false)) + + assertFalse(capabilities.contains(OpenClawCapability.CallLog.rawValue)) + } + private fun defaultFlags( cameraEnabled: Boolean = false, locationEnabled: Boolean = false, sendSmsAvailable: Boolean = false, readSmsAvailable: Boolean = false, + callLogAvailable: Boolean = false, voiceWakeEnabled: Boolean = false, motionActivityAvailable: Boolean = false, motionPedometerAvailable: Boolean = false, @@ -188,6 +206,7 @@ class InvokeCommandRegistryTest { locationEnabled = locationEnabled, sendSmsAvailable = sendSmsAvailable, readSmsAvailable = readSmsAvailable, + callLogAvailable = callLogAvailable, voiceWakeEnabled = voiceWakeEnabled, motionActivityAvailable = motionActivityAvailable, motionPedometerAvailable = motionPedometerAvailable,