Skip to content

Commit e5e0d75

Browse files
committed
android: bump OSS
OSS and Version updated to 1.97.11-te400d5aa7-g0e60ef4a8 Signed-off-by: kari-ts <kari@tailscale.com>
1 parent 0e60ef4 commit e5e0d75

5 files changed

Lines changed: 13 additions & 17 deletions

File tree

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,6 @@ class App : UninitializedApp(), libtailscale.AppContext, ViewModelStoreOwner {
457457
}
458458

459459
val iface = NetworkChangeCallback.cachedDefaultInterfaceName
460-
?: NetworkChangeCallback.cachedDefaultNetworkInfo?.linkProps?.interfaceName
461460

462461
TSLog.d(TAG, "bindSocketToActiveNetwork: binding fd=$fd to net=$net iface=$iface")
463462

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ object NetworkChangeCallback {
3434

3535
// Cached info for the chosen default network.
3636
@Volatile
37-
var cachedDefaultNetworkInfo: NetworkInfo? = null
37+
private var cachedDefaultNetworkInfo: NetworkInfo? = null
3838
private set
3939

4040
// Convenience: cached interface name for logging.
@@ -170,11 +170,10 @@ object NetworkChangeCallback {
170170

171171
val info = if (newNetwork != null) activeNetworks[newNetwork] else null
172172
cachedDefaultNetworkInfo = info
173-
cachedDefaultInterfaceName = info?.linkProps?.interfaceName
174173

175174
TSLog.d(
176175
TAG,
177-
"$why: cachedDefaultNetwork=$newNetwork iface=${cachedDefaultInterfaceName ?: "none"}")
176+
"$why: cachedDefaultNetwork=$newNetwork iface=${info?.linkProps?.interfaceName ?: "none"}")
178177
}
179178

180179
/**

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
module github.com/tailscale/tailscale-android
22

3-
go 1.26.0
3+
go 1.26.1
44

55
require (
66
github.com/tailscale/wireguard-go v0.0.0-20250716170648-1d0488a3d7da
77
golang.org/x/mobile v0.0.0-20240806205939-81131f6468ab
8-
tailscale.com v1.97.0-pre.0.20260305210036-9657a9321795
8+
tailscale.com v1.97.0-pre.0.20260306220535-e400d5aa7b22
99
)
1010

1111
require (
@@ -75,14 +75,14 @@ require (
7575
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
7676
golang.org/x/crypto v0.46.0 // indirect
7777
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
78-
golang.org/x/mod v0.30.0 // indirect
78+
golang.org/x/mod v0.31.0 // indirect
7979
golang.org/x/net v0.48.0 // indirect
8080
golang.org/x/sync v0.19.0 // indirect
8181
golang.org/x/sys v0.40.0 // indirect
8282
golang.org/x/term v0.38.0 // indirect
8383
golang.org/x/text v0.32.0 // indirect
8484
golang.org/x/time v0.12.0 // indirect
85-
golang.org/x/tools v0.39.0 // indirect
85+
golang.org/x/tools v0.40.1-0.20260108161641-ca281cf95054 // indirect
8686
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
8787
golang.zx2c4.com/wireguard/windows v0.5.3 // indirect
8888
gvisor.dev/gvisor v0.0.0-20260224225140-573d5e7127a8 // indirect

go.sum

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,8 @@ golang.org/x/image v0.27.0 h1:C8gA4oWU/tKkdCfYT6T2u4faJu3MeNS5O8UPWlPF61w=
204204
golang.org/x/image v0.27.0/go.mod h1:xbdrClrAUway1MUTEZDq9mz/UpRwYAkFFNUslZtcB+g=
205205
golang.org/x/mobile v0.0.0-20240806205939-81131f6468ab h1:KONOFF8Uy3b60HEzOsGnNghORNhY4ImyOx0PGm73K9k=
206206
golang.org/x/mobile v0.0.0-20240806205939-81131f6468ab/go.mod h1:udWezQGYjqrCxz5nV321pXQTx5oGbZx+khZvFjZNOPM=
207-
golang.org/x/mod v0.30.0 h1:fDEXFVZ/fmCKProc/yAXXUijritrDzahmwwefnjoPFk=
208-
golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc=
207+
golang.org/x/mod v0.31.0 h1:HaW9xtz0+kOcWKwli0ZXy79Ix+UW/vOfmWI5QVd2tgI=
208+
golang.org/x/mod v0.31.0/go.mod h1:43JraMp9cGx1Rx3AqioxrbrhNsLl2l/iNAvuBkrezpg=
209209
golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
210210
golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
211211
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -225,8 +225,8 @@ golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
225225
golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
226226
golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
227227
golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
228-
golang.org/x/tools v0.39.0 h1:ik4ho21kwuQln40uelmciQPp9SipgNDdrafrYA4TmQQ=
229-
golang.org/x/tools v0.39.0/go.mod h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ=
228+
golang.org/x/tools v0.40.1-0.20260108161641-ca281cf95054 h1:CHVDrNHx9ZoOrNN9kKWYIbT5Rj+WF2rlwPkhbQQ5V4U=
229+
golang.org/x/tools v0.40.1-0.20260108161641-ca281cf95054/go.mod h1:Ik/tzLRlbscWpqqMRjyWYDisX8bG13FrdXp3o4Sr9lc=
230230
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg=
231231
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI=
232232
golang.zx2c4.com/wireguard/windows v0.5.3 h1:On6j2Rpn3OEMXqBq00QEDC7bWSZrPIHKIus8eIuExIE=
@@ -239,11 +239,9 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
239239
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
240240
gvisor.dev/gvisor v0.0.0-20260224225140-573d5e7127a8 h1:Zy8IV/+FMLxy6j6p87vk/vQGKcdnbprwjTxc8UiUtsA=
241241
gvisor.dev/gvisor v0.0.0-20260224225140-573d5e7127a8/go.mod h1:QkHjoMIBaYtpVufgwv3keYAbln78mBoCuShZrPrer1Q=
242-
honnef.co/go/tools v0.7.0-0.dev.0.20251022135355-8273271481d0 h1:5SXjd4ET5dYijLaf0O3aOenC0Z4ZafIWSpjUzsQaNho=
243-
honnef.co/go/tools v0.7.0-0.dev.0.20251022135355-8273271481d0/go.mod h1:EPDDhEZqVHhWuPI5zPAsjU0U7v9xNIWjoOVyZ5ZcniQ=
242+
honnef.co/go/tools v0.7.0 h1:w6WUp1VbkqPEgLz4rkBzH/CSU6HkoqNLp6GstyTx3lU=
243+
honnef.co/go/tools v0.7.0/go.mod h1:pm29oPxeP3P82ISxZDgIYeOaf9ta6Pi0EWvCFoLG2vc=
244244
howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM=
245245
howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g=
246246
software.sslmate.com/src/go-pkcs12 v0.4.0 h1:H2g08FrTvSFKUj+D309j1DPfk5APnIdAQAB8aEykJ5k=
247247
software.sslmate.com/src/go-pkcs12 v0.4.0/go.mod h1:Qiz0EyvDRJjjxGyUQa2cCNZn/wMyzrRJ/qcDXOQazLI=
248-
tailscale.com v1.97.0-pre.0.20260305210036-9657a9321795 h1:trJWbIPExs0zPKqU85QSThZ2wgYvIO39OUMMtw1APGQ=
249-
tailscale.com v1.97.0-pre.0.20260305210036-9657a9321795/go.mod h1:ODw30r4etIPiyxbCtP7bm42GytEoJLzbqhL5ZX0al+I=

go.toolchain.rev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5b5cb0db47535a0a8d2f450cb1bf83af8e70f164
1+
0f1a3326f30508521e7b8322f4e0f084560c1404

0 commit comments

Comments
 (0)