#1394 use system bridge for airplane mode actions

Author: sds100

sysbridge/src/main/aidl/io/github/sds100/keymapper/sysbridge/ISystemBridge.aidl

@@ -33,4 +33,6 @@ interface ISystemBridge {
    void setBluetoothEnabled(boolean enable) = 13;
 
    void setNfcEnabled(boolean enable) = 14;
+
+   void setAirplaneMode(boolean enable) = 15;
 }

sysbridge/src/main/java/io/github/sds100/keymapper/sysbridge/service/SystemBridge.kt

@@ -9,6 +9,7 @@ import android.content.pm.ApplicationInfo
 import android.content.pm.IPackageManager
 import android.content.pm.PackageManager
 import android.hardware.input.IInputManager
+import android.net.IConnectivityManager
 import android.net.wifi.IWifiManager
 import android.nfc.INfcAdapter
 import android.nfc.NfcAdapterApis
@@ -165,6 +166,7 @@ internal class SystemBridge : ISystemBridge.Stub() {
     private val packageManager: IPackageManager
     private val bluetoothManager: IBluetoothManager?
     private val nfcAdapter: INfcAdapter?
+    private val connectivityManager: IConnectivityManager?
 
     private val processPackageName: String = when (Process.myUid()) {
         Process.ROOT_UID -> "root"
@@ -225,6 +227,10 @@ internal class SystemBridge : ISystemBridge.Stub() {
             nfcAdapter = null
         }
 
+        waitSystemService(Context.CONNECTIVITY_SERVICE)
+        connectivityManager =
+            IConnectivityManager.Stub.asInterface(ServiceManager.getService(Context.CONNECTIVITY_SERVICE))
+
         val applicationInfo = getKeyMapperPackageInfo()
 
         if (applicationInfo == null) {
@@ -562,4 +568,12 @@ internal class SystemBridge : ISystemBridge.Stub() {
             )
         }
     }
+
+    override fun setAirplaneMode(enable: Boolean) {
+        if (connectivityManager == null) {
+            throw UnsupportedOperationException("ConnectivityManager not supported")
+        }
+
+        connectivityManager.setAirplaneMode(enable)
+    }
 }

system/src/main/java/io/github/sds100/keymapper/system/airplanemode/AirplaneModeAdapter.kt

@@ -4,6 +4,6 @@ import io.github.sds100.keymapper.common.utils.KMResult
 
 interface AirplaneModeAdapter {
     fun isEnabled(): Boolean
-    fun enable(): KMResult<*>
-    fun disable(): KMResult<*>
+    suspend fun enable(): KMResult<*>
+    suspend fun disable(): KMResult<*>
 }

system/src/main/java/io/github/sds100/keymapper/system/airplanemode/AndroidAirplaneModeAdapter.kt

@@ -1,31 +1,52 @@
 package io.github.sds100.keymapper.system.airplanemode
 
 import android.content.Context
+import android.os.Build
 import android.provider.Settings
 import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.sds100.keymapper.common.utils.KMError
 import io.github.sds100.keymapper.common.utils.KMResult
 import io.github.sds100.keymapper.common.utils.SettingsUtils
-import io.github.sds100.keymapper.common.utils.onSuccess
+import io.github.sds100.keymapper.common.utils.Success
+import io.github.sds100.keymapper.sysbridge.manager.SystemBridgeConnectionManager
 import io.github.sds100.keymapper.system.root.SuAdapter
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class AndroidAirplaneModeAdapter @Inject constructor(
-    @ApplicationContext private val context: Context,
-    val suAdapter: SuAdapter,
+    @ApplicationContext private val ctx: Context,
+    private val systemBridgeConnectionManager: SystemBridgeConnectionManager,
+    private val suAdapter: SuAdapter
 ) : AirplaneModeAdapter {
-    private val ctx = context.applicationContext
 
-    override fun enable(): KMResult<*> =
-        suAdapter.execute("settings put global airplane_mode_on 1").onSuccess {
-            broadcastAirplaneModeChanged(false)
+    override suspend fun enable(): KMResult<*> {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            systemBridgeConnectionManager.run { bridge -> bridge.setAirplaneMode(true) }
+        } else {
+            val success = SettingsUtils.putGlobalSetting(ctx, Settings.Global.AIRPLANE_MODE_ON, 1)
+            broadcastAirplaneModeChanged(true)
+            if (success) {
+                Success(Unit)
+            } else {
+                KMError.FailedToModifySystemSetting(Settings.Global.AIRPLANE_MODE_ON)
+            }
         }
+    }
 
-    override fun disable(): KMResult<*> =
-        suAdapter.execute("settings put global airplane_mode_on 0").onSuccess {
-            broadcastAirplaneModeChanged(false)
+    override suspend fun disable(): KMResult<*> {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            systemBridgeConnectionManager.run { bridge -> bridge.setAirplaneMode(false) }
+        } else {
+            val success = SettingsUtils.putGlobalSetting(ctx, Settings.Global.AIRPLANE_MODE_ON, 0)
+            if (success) {
+                broadcastAirplaneModeChanged(false)
+                Success(Unit)
+            } else {
+                KMError.FailedToModifySystemSetting(Settings.Global.AIRPLANE_MODE_ON)
+            }
         }
+    }
 
     override fun isEnabled(): Boolean =
         SettingsUtils.getGlobalSetting<Int>(ctx, Settings.Global.AIRPLANE_MODE_ON) == 1

systemstubs/src/main/aidl/android/net/IConnectivityManager.aidl

@@ -0,0 +1,5 @@
+package android.net;
+
+interface IConnectivityManager {
+  void setAirplaneMode(boolean enable);
+}