Skip to content

Commit 205aeae

Browse files
authored
android: omit excludedRoutes for API<33 (#582)
updates tailscale/corp#25083 excludedRoutes is only supported on API 33 and up so it needs a version check. Signed-off-by: Jonathan Nobels <[email protected]>
1 parent 4e9cceb commit 205aeae

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

android/src/main/java/com/tailscale/ipn/VPNServiceBuilder.kt

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33

44
package com.tailscale.ipn
55

6+
import android.net.IpPrefix as AndroidIpPrefix
67
import android.net.VpnService
7-
import libtailscale.ParcelFileDescriptor
8+
import android.os.Build
89
import java.net.InetAddress
9-
import android.net.IpPrefix as AndroidIpPrefix
10+
import libtailscale.ParcelFileDescriptor
1011

1112
class VPNServiceBuilder(private val builder: VpnService.Builder) : libtailscale.VPNServiceBuilder {
1213
override fun addAddress(p0: String, p1: Int) {
@@ -22,9 +23,12 @@ class VPNServiceBuilder(private val builder: VpnService.Builder) : libtailscale.
2223
}
2324

2425
override fun excludeRoute(p0: String, p1: Int) {
25-
val inetAddress = InetAddress.getByName(p0)
26-
val prefix = AndroidIpPrefix(inetAddress, p1)
27-
builder.excludeRoute(prefix)
26+
// Only run this for API level 33 and up
27+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
28+
val inetAddress = InetAddress.getByName(p0)
29+
val prefix = AndroidIpPrefix(inetAddress, p1)
30+
builder.excludeRoute(prefix)
31+
}
2832
}
2933

3034
override fun addSearchDomain(p0: String) {
@@ -40,8 +44,7 @@ class VPNServiceBuilder(private val builder: VpnService.Builder) : libtailscale.
4044
}
4145
}
4246

43-
class ParcelFileDescriptor(private val fd: android.os.ParcelFileDescriptor) :
44-
libtailscale.ParcelFileDescriptor {
47+
class ParcelFileDescriptor(private val fd: android.os.ParcelFileDescriptor) : ParcelFileDescriptor {
4548
override fun detach(): Int {
4649
return fd.detachFd()
4750
}

0 commit comments

Comments
 (0)