From 61895c47a127bedb38d976dd7c2c5afff445c7f9 Mon Sep 17 00:00:00 2001 From: Andrea Gottardo Date: Fri, 17 Jan 2025 14:53:01 -0800 Subject: [PATCH] mdm: define Hostname syspolicy on Android (#598) Updates tailscale/corp#25936 Adds a definition for the Hostname syspolicy which we are adding in OSS: https://github.com/tailscale/tailscale/pull/14676 Also adds it to the app_restrictions.xml file so that MDM solutions can pick it up. Signed-off-by: Andrea Gottardo --- android/src/main/java/com/tailscale/ipn/mdm/MDMSettings.kt | 3 +++ android/src/main/res/values/strings.xml | 2 ++ android/src/main/res/xml/app_restrictions.xml | 6 ++++++ 3 files changed, 11 insertions(+) diff --git a/android/src/main/java/com/tailscale/ipn/mdm/MDMSettings.kt b/android/src/main/java/com/tailscale/ipn/mdm/MDMSettings.kt index c5892bd..3364ceb 100644 --- a/android/src/main/java/com/tailscale/ipn/mdm/MDMSettings.kt +++ b/android/src/main/java/com/tailscale/ipn/mdm/MDMSettings.kt @@ -94,6 +94,9 @@ object MDMSettings { // Handled on the backend val authKey = StringMDMSetting("AuthKey", "Auth Key for login") + // Overrides the value provided by os.Hostname() in Go + val hostname = StringMDMSetting("Hostname", "Device Hostname") + val allSettings by lazy { MDMSettings::class .declaredMemberProperties diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml index 0c5d8e2..e9a121f 100644 --- a/android/src/main/res/values/strings.xml +++ b/android/src/main/res/values/strings.xml @@ -319,5 +319,7 @@ Run as subnet router Route traffic according to your network\'s rules. Some networks require this to access IP addresses that don\'t start with 100.x.y.z. Subnet routing + Specifies a device name to be used instead of the automatic default. + Hostname diff --git a/android/src/main/res/xml/app_restrictions.xml b/android/src/main/res/xml/app_restrictions.xml index d62c7fc..7f5549f 100644 --- a/android/src/main/res/xml/app_restrictions.xml +++ b/android/src/main/res/xml/app_restrictions.xml @@ -128,4 +128,10 @@ android:key="AuthKey" android:restrictionType="string" android:title="@string/auth_key" /> + + \ No newline at end of file