summaryrefslogtreecommitdiffhomepage
path: root/android/src/main
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-05-18 17:52:40 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-05-20 12:13:07 +0000
commita329cca8e372e86a878f00c3e9d99d887f8cd96f (patch)
tree8c561c240d252fab53d1e1b48367e9a4c982a08d /android/src/main
parenta5ee9c4dba9ebb27b776aba021af1b564d71011a (diff)
downloadmullvadvpn-a329cca8e372e86a878f00c3e9d99d887f8cd96f.tar.xz
mullvadvpn-a329cca8e372e86a878f00c3e9d99d887f8cd96f.zip
Promise that the service will run in foreground
Diffstat (limited to 'android/src/main')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt8
1 files changed, 7 insertions, 1 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
index 524d4ab00d..2bbd439325 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
@@ -3,6 +3,7 @@ package net.mullvad.mullvadvpn.ui
import android.app.Activity
import android.content.ComponentName
import android.content.Intent
+import android.os.Build
import android.os.Bundle
import android.os.IBinder
import android.support.v4.app.FragmentActivity
@@ -85,7 +86,12 @@ class MainActivity : FragmentActivity() {
val intent = Intent(this, MullvadVpnService::class.java)
- startService(intent)
+ if (Build.VERSION.SDK_INT >= 26) {
+ startForegroundService(intent)
+ } else {
+ startService(intent)
+ }
+
bindService(intent, serviceConnectionManager, 0)
}