#1999 Use a more reliable method to check whether Shell has GRANT_RUNTIME_PERMISSIONS permission

sds100 · sds100 · commit 12ea212930a1 · 2026-02-01T14:33:29.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - #2005 NPE in onSaveInstanceState.
 - #2000 tell the user to tap OS version or build number.
 - #1996 Check if Night Shift is supported on a device before activating to prevent the screen going black when activated.
+- #1999 Use a more reliable method to check whether Shell has GRANT_RUNTIME_PERMISSIONS permission.
 
 ## [4.0.0](https://github.com/sds100/KeyMapper/releases/tag/v4.0.0)
 
diff --git a/base/src/main/java/io/github/sds100/keymapper/base/expertmode/ExpertModeScreen.kt b/base/src/main/java/io/github/sds100/keymapper/base/expertmode/ExpertModeScreen.kt
@@ -332,7 +332,7 @@ private fun LoadedContent(
 
                 // Only show auto-start options and warnings when Expert Mode is started
                 // Show USB debugging security settings warning if disabled
-                if (state.isAdbInputSecurityEnabled == false) {
+                if (state.showXiaomiAdbInputSecurityWarning) {
                     UsbDebuggingSecuritySettingsCard(
                         modifier = Modifier
                             .fillMaxWidth()
@@ -970,7 +970,7 @@ private fun PreviewDark() {
                         isDefaultUsbModeCompatible = true,
                         autoStartBootChecked = true,
                         autoStartBootEnabled = true,
-                        isAdbInputSecurityEnabled = null,
+                        showXiaomiAdbInputSecurityWarning = false,
                     ),
                 ),
                 showInfoCard = false,
@@ -1013,7 +1013,7 @@ private fun PreviewStarted() {
                         isDefaultUsbModeCompatible = false,
                         autoStartBootChecked = false,
                         autoStartBootEnabled = true,
-                        isAdbInputSecurityEnabled = null,
+                        showXiaomiAdbInputSecurityWarning = false,
                     ),
                 ),
                 showInfoCard = false,
@@ -1062,7 +1062,7 @@ private fun PreviewUsbDebuggingSecuritySettingsCard() {
                         isDefaultUsbModeCompatible = true,
                         autoStartBootChecked = false,
                         autoStartBootEnabled = true,
-                        isAdbInputSecurityEnabled = false,
+                        showXiaomiAdbInputSecurityWarning = false,
                     ),
                 ),
                 showInfoCard = false,
diff --git a/base/src/main/java/io/github/sds100/keymapper/base/expertmode/ExpertModeViewModel.kt b/base/src/main/java/io/github/sds100/keymapper/base/expertmode/ExpertModeViewModel.kt
@@ -198,15 +198,15 @@ class ExpertModeViewModel @Inject constructor(
     private fun startedStateFlow(): Flow<ExpertModeState.Started> = combine(
         useCase.isAutoStartBootEnabled,
         useCase.isAutoStartBootAllowed,
-        useCase.isAdbInputSecurityEnabled,
-    ) { autoStartBootChecked, autoStartBootEnabled, isAdbInputSecurityEnabled ->
+        useCase.shellHasGrantRuntimePermissions,
+    ) { autoStartBootChecked, autoStartBootEnabled, shellHasGrantRuntimePermissions ->
         ExpertModeState.Started(
             isDefaultUsbModeCompatible =
             useCase.isCompatibleUsbModeSelected().valueOrNull()
                 ?: false,
             autoStartBootChecked = autoStartBootChecked,
             autoStartBootEnabled = autoStartBootEnabled,
-            isAdbInputSecurityEnabled = isAdbInputSecurityEnabled,
+            showXiaomiAdbInputSecurityWarning = !shellHasGrantRuntimePermissions,
         )
     }
 }
@@ -230,7 +230,7 @@ sealed class ExpertModeState {
         val isDefaultUsbModeCompatible: Boolean,
         val autoStartBootChecked: Boolean,
         val autoStartBootEnabled: Boolean,
-        val isAdbInputSecurityEnabled: Boolean?,
+        val showXiaomiAdbInputSecurityWarning: Boolean,
     ) : ExpertModeState()
 }
 
diff --git a/base/src/main/java/io/github/sds100/keymapper/base/expertmode/SystemBridgeSetupUseCase.kt b/base/src/main/java/io/github/sds100/keymapper/base/expertmode/SystemBridgeSetupUseCase.kt
@@ -186,13 +186,8 @@ class SystemBridgeSetupUseCaseImpl @Inject constructor(
         systemBridgeSetupController.launchDeveloperOptions()
     }
 
-    @RequiresApi(Build.VERSION_CODES.R)
-    override val isAdbInputSecurityEnabled: Flow<Boolean?> =
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            systemBridgeSetupController.isAdbInputSecurityEnabled
-        } else {
-            flowOf(null)
-        }
+    override val shellHasGrantRuntimePermissions: Flow<Boolean> =
+        systemBridgeSetupController.shellHasGrantRuntimePermissions
 
     override fun connectWifiNetwork() {
         networkAdapter.connectWifiNetwork()
@@ -355,7 +350,7 @@ interface SystemBridgeSetupUseCase {
     fun startSystemBridgeWithAdb()
     fun autoStartSystemBridgeWithAdb()
 
-    val isAdbInputSecurityEnabled: Flow<Boolean?>
+    val shellHasGrantRuntimePermissions: Flow<Boolean>
 
     fun isCompatibleUsbModeSelected(): KMResult<Boolean>
 
diff --git a/sysbridge/src/main/java/io/github/sds100/keymapper/sysbridge/service/SystemBridgeSetupController.kt b/sysbridge/src/main/java/io/github/sds100/keymapper/sysbridge/service/SystemBridgeSetupController.kt
@@ -19,15 +19,12 @@ import io.github.sds100.keymapper.common.KeyMapperClassProvider
 import io.github.sds100.keymapper.common.utils.Constants
 import io.github.sds100.keymapper.common.utils.KMResult
 import io.github.sds100.keymapper.common.utils.SettingsUtils
-import io.github.sds100.keymapper.common.utils.Success
 import io.github.sds100.keymapper.common.utils.isSuccess
 import io.github.sds100.keymapper.common.utils.onSuccess
 import io.github.sds100.keymapper.sysbridge.adb.AdbManager
 import io.github.sds100.keymapper.sysbridge.manager.SystemBridgeConnectionManager
 import io.github.sds100.keymapper.sysbridge.manager.SystemBridgeConnectionState
-import io.github.sds100.keymapper.sysbridge.manager.SystemBridgeConnectionState.Connected
 import io.github.sds100.keymapper.sysbridge.manager.awaitConnected
-import io.github.sds100.keymapper.sysbridge.manager.isConnected
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlinx.coroutines.CoroutineScope
@@ -81,8 +78,8 @@ class SystemBridgeSetupControllerImpl @Inject constructor(
     private val isAdbPairedResult: MutableStateFlow<Boolean?> = MutableStateFlow(null)
     private var isAdbPairedJob: Job? = null
 
-    override val isAdbInputSecurityEnabled: MutableStateFlow<Boolean?> = MutableStateFlow(null)
-    private var checkAdbInputSecurityJob: Job? = null
+    override val shellHasGrantRuntimePermissions: MutableStateFlow<Boolean> =
+        MutableStateFlow(getShellHasGrantRuntimePermissions())
 
     init {
         // Automatically go back to the Key Mapper app when turning on wireless debugging
@@ -94,7 +91,6 @@ class SystemBridgeSetupControllerImpl @Inject constructor(
                 // Do not automatically go back to Key Mapper after this step because
                 // some devices show a dialog that will be auto dismissed resulting in wireless
                 // ADB being immediately disabled. E.g OnePlus 6T Oxygen OS 11
-                // Note: ADB input security check is handled by monitoring isWirelessDebuggingEnabled flow
             }
         }
 
@@ -110,27 +106,6 @@ class SystemBridgeSetupControllerImpl @Inject constructor(
                 }
             }
         }
-
-        // Automatically check ADB input security when SystemBridge is connected
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            coroutineScope.launch {
-                // Check when SystemBridge becomes connected
-                connectionManager.connectionState.collect { connectionState ->
-                    when (connectionState) {
-                        is Connected -> {
-                            // Delay a bit to ensure SystemBridge is ready
-                            kotlinx.coroutines.delay(1000L)
-                            checkAdbInputSecurityEnabled()
-                        }
-
-                        is SystemBridgeConnectionState.Disconnected -> {
-                            // Reset to null when SystemBridge is disconnected
-                            isAdbInputSecurityEnabled.value = null
-                        }
-                    }
-                }
-            }
-        }
     }
 
     override fun startWithRoot() {
@@ -396,51 +371,10 @@ class SystemBridgeSetupControllerImpl @Inject constructor(
         )
     }
 
-    private fun checkAdbInputSecurityEnabled() {
-        if (!connectionManager.isConnected()) {
-            isAdbInputSecurityEnabled.value = null
-            return
-        }
-
-        // Only run one check at a time
-        if (checkAdbInputSecurityJob == null || checkAdbInputSecurityJob?.isCompleted == true) {
-            checkAdbInputSecurityJob?.cancel()
-
-            checkAdbInputSecurityJob = coroutineScope.launch {
-                try {
-                    val result = connectionManager.run { systemBridge ->
-                        systemBridge.executeCommand("getprop persist.security.adbinput", 5000L)
-                    }
-
-                    val isEnabled = when (result) {
-                        is Success -> {
-                            val stdout = result.value.stdout.trim()
-
-                            when (stdout) {
-                                "1" -> true
-
-                                "0" -> false
-
-                                // If it is empty or anything else then set the value to null
-                                // because what we are expecting does not exist.
-                                else -> null
-                            }
-                        }
-
-                        else -> null
-                    }
-                    isAdbInputSecurityEnabled.value = isEnabled
-                } catch (_: Exception) {
-                    // If check fails, set to null
-                    isAdbInputSecurityEnabled.value = null
-                }
-            }
-        }
-    }
-
     fun invalidateSettings() {
         isDeveloperOptionsEnabled.update { getDeveloperOptionsEnabled() }
         isWirelessDebuggingEnabled.update { getWirelessDebuggingEnabled() }
+        shellHasGrantRuntimePermissions.update { getShellHasGrantRuntimePermissions() }
     }
 
     private fun getDeveloperOptionsEnabled(): Boolean {
@@ -459,6 +393,13 @@ class SystemBridgeSetupControllerImpl @Inject constructor(
         }
     }
 
+    private fun getShellHasGrantRuntimePermissions(): Boolean {
+        return ctx.packageManager.checkPermission(
+            "android.permission.GRANT_RUNTIME_PERMISSIONS",
+            "com.android.shell",
+        ) == PackageManager.PERMISSION_GRANTED
+    }
+
     private fun getKeyMapperAppTask(): ActivityManager.AppTask? {
         val task = activityManager.appTasks
             ?.firstOrNull {
@@ -506,10 +447,14 @@ interface SystemBridgeSetupController {
     fun autoStartWithAdb()
 
     /**
-     * If this value is null then the option does not exist or can not be checked
-     * because the system bridge is disconnected.
+     * See issue #1965.
+     *
+     * Whether the Shell package has GRANT_RUNTIME_PERMISSIONS permission. On Xiaomi devices, the
+     * user needs to enable "USB debugging security settings" in Developer Options for
+     * the Shell to have permission to grant runtime permissions, such as WRITE_SECURE_SETTINGS
+     * to Key Mapper.
      */
-    val isAdbInputSecurityEnabled: StateFlow<Boolean?>
+    val shellHasGrantRuntimePermissions: StateFlow<Boolean>
 
     fun launchDeveloperOptions()
 
