From f2c035a8bfcbc2ff9e659900ac65375eb03a3689 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Wed, 2 Dec 2020 15:53:11 +0100 Subject: [PATCH] cmd/tailscale: note in Hostinfo.OSVersion if Google Play is unavailable Signed-off-by: Elias Naur --- cmd/tailscale/main.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/tailscale/main.go b/cmd/tailscale/main.go index 803bd0a..aa8e265 100644 --- a/cmd/tailscale/main.go +++ b/cmd/tailscale/main.go @@ -356,7 +356,8 @@ func (a *App) hostname() string { return hostname } -// osVersion returns android.os.Build.MODEL. +// osVersion returns android.os.Build.VERSION.RELEASE. " [nogoogle]" is appended +// if Google Play services are not compiled in. func (a *App) osVersion() string { var version string err := jni.Do(a.jvm, func(env jni.Env) error { @@ -369,6 +370,9 @@ func (a *App) osVersion() string { if err != nil { panic(err) } + if !googleSignInEnabled() { + version += " [nogoogle]" + } return version }