From 0e64680962cf8cfa5132cc64952ee4d38550821f Mon Sep 17 00:00:00 2001
From: kari-ts <kari@tailscale.com>
Date: Tue, 3 Dec 2024 16:57:23 -0800
Subject: [PATCH] android: specify whether or not receivers are exported

Per https://developer.android.com/about/versions/14/behavior-changes-14#runtime-receivers-exported, we need to register all receivers.

Fixes tailscale/corp#25021

Signed-off-by: kari-ts <kari@tailscale.com>
---
 android/src/main/AndroidManifest.xml                      | 8 ++++++++
 android/src/main/java/com/tailscale/ipn/App.kt            | 2 +-
 .../com/tailscale/ipn/mdm/MDMSettingsChangedReceiver.kt   | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index 7f3cb217bb..0f1118e0f3 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -99,6 +99,14 @@
             </intent-filter>
         </receiver>
 
+        <receiver
+            android:name=".MDMSettingsChangedReceiver"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.intent.action.APPLICATION_RESTRICTIONS_CHANGED" />
+            </intent-filter>
+<       /receiver>
+
         <service
             android:name=".IPNService"
             android:exported="false"
diff --git a/android/src/main/java/com/tailscale/ipn/App.kt b/android/src/main/java/com/tailscale/ipn/App.kt
index 3b5b243f24..0091c71c7f 100644
--- a/android/src/main/java/com/tailscale/ipn/App.kt
+++ b/android/src/main/java/com/tailscale/ipn/App.kt
@@ -461,7 +461,7 @@ open class UninitializedApp : Application() {
 
     // Register the receiver before stopping VPN
     val intentFilter = IntentFilter(IPNService.ACTION_STOP_VPN)
-    this.registerReceiver(stopReceiver, intentFilter)
+    this.registerReceiver(stopReceiver, intentFilter, Context.RECEIVER_NOT_EXPORTED)
 
     stopVPN()
   }
diff --git a/android/src/main/java/com/tailscale/ipn/mdm/MDMSettingsChangedReceiver.kt b/android/src/main/java/com/tailscale/ipn/mdm/MDMSettingsChangedReceiver.kt
index b4d17b803a..5584fde8f7 100644
--- a/android/src/main/java/com/tailscale/ipn/mdm/MDMSettingsChangedReceiver.kt
+++ b/android/src/main/java/com/tailscale/ipn/mdm/MDMSettingsChangedReceiver.kt
@@ -12,7 +12,7 @@ import com.tailscale.ipn.util.TSLog
 
 class MDMSettingsChangedReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context?, intent: Intent?) {
-        if (intent?.action == android.content.Intent.ACTION_APPLICATION_RESTRICTIONS_CHANGED) {
+        if (intent?.action == Intent.ACTION_APPLICATION_RESTRICTIONS_CHANGED) {
             TSLog.d("syspolicy", "MDM settings changed")
             val restrictionsManager = context?.getSystemService(Context.RESTRICTIONS_SERVICE) as RestrictionsManager
             MDMSettings.update(App.get(), restrictionsManager)