summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAlbin <albin@mullvad.net>2022-11-23 13:39:36 +0100
committerAlbin <albin@mullvad.net>2022-11-23 13:39:36 +0100
commit73a35cf4a36b4849b41ff9f16c9495fa3c7b15e9 (patch)
tree40e15e7dbecfff705a3e4d0f48c8e3f3bc4292d5
parent31f102ee36606d67fb138d2f83537972fcf73348 (diff)
parent3260de45ac81a337f0ba4d8942bd6757ebede0fa (diff)
downloadmullvadvpn-73a35cf4a36b4849b41ff9f16c9495fa3c7b15e9.tar.xz
mullvadvpn-73a35cf4a36b4849b41ff9f16c9495fa3c7b15e9.zip
Merge branch 'android-12-halt-on-start'
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/SdkUtils.kt2
1 files changed, 1 insertions, 1 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/SdkUtils.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/SdkUtils.kt
index c6aa4d9457..ad0bb1d0d5 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/SdkUtils.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/SdkUtils.kt
@@ -10,7 +10,7 @@ import android.service.quicksettings.Tile
object SdkUtils {
fun getSupportedPendingIntentFlags(): Int {
- return if (Build.VERSION.SDK_INT > Build.VERSION_CODES.S) {
+ return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE
} else {
PendingIntent.FLAG_UPDATE_CURRENT