From 66a71e55b30ac3e917ae04ed5273b978d340d7b2 Mon Sep 17 00:00:00 2001
From: Etan Cohen <etancohen@google.com>
Date: Mon, 23 Dec 2019 14:39:54 -0800
Subject: [PATCH 1/2] [WIFI] Protect broadcasts used by the Wi-Fi framework

Make sure the broadcasts used by the Wi-Fi framework are protected:
i.e. can only be transmitted by privileged components (as opposed to
any 3rd party app).

Broadcast: MAC randomization

Bug: 146642727
Test: atest android.net.wifi
Test: atest com.android.server.wifi
Change-Id: Id4c7c0868ced4b3edb8752e10c0350c190cee862
Merged-In: I9a0bf4428774b13cc6414a223f378e09341a6a55
---
 core/res/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index e7e20fc41eeec..e5c92a1941a65 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -343,6 +343,7 @@
     <protected-broadcast android:name="com.android.server.am.DELETE_DUMPHEAP" />
     <protected-broadcast android:name="com.android.server.net.action.SNOOZE_WARNING" />
     <protected-broadcast android:name="com.android.server.net.action.SNOOZE_RAPID" />
+    <protected-broadcast android:name="com.android.server.wifi.ACTION_SHOW_SET_RANDOMIZATION_DETAILS" />
     <protected-broadcast android:name="com.android.server.wifi.ConnectToNetworkNotification.USER_DISMISSED_NOTIFICATION" />
     <protected-broadcast android:name="com.android.server.wifi.ConnectToNetworkNotification.CONNECT_TO_NETWORK" />
     <protected-broadcast android:name="com.android.server.wifi.ConnectToNetworkNotification.PICK_WIFI_NETWORK" />

From 7c8fce66abaf128339db09ac11eefa9ccdd1f257 Mon Sep 17 00:00:00 2001
From: Etan Cohen <etancohen@google.com>
Date: Fri, 27 Dec 2019 12:47:18 -0800
Subject: [PATCH 2/2] [WIFI] Protect broadcasts used by the Wi-Fi framework

Make sure the broadcasts used by the Wi-Fi framework are protected:
i.e. can only be transmitted by privileged components (as opposed to
any 3rd party app).

Broadcast: Suggestion API

Bug: 146642727
Test: atest android.net.wifi
Test: atest com.android.server.wifi
Merged-In: I9a0bf4428774b13cc6414a223f378e09341a6a55
Change-Id: I9a0bf4428774b13cc6414a223f378e09341a6a55
---
 core/res/AndroidManifest.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index e5c92a1941a65..aa5141d98cc35 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -344,6 +344,9 @@
     <protected-broadcast android:name="com.android.server.net.action.SNOOZE_WARNING" />
     <protected-broadcast android:name="com.android.server.net.action.SNOOZE_RAPID" />
     <protected-broadcast android:name="com.android.server.wifi.ACTION_SHOW_SET_RANDOMIZATION_DETAILS" />
+    <protected-broadcast android:name="com.android.server.wifi.action.NetworkSuggestion.USER_ALLOWED_APP" />
+    <protected-broadcast android:name="com.android.server.wifi.action.NetworkSuggestion.USER_DISALLOWED_APP" />
+    <protected-broadcast android:name="com.android.server.wifi.action.NetworkSuggestion.USER_DISMISSED" />
     <protected-broadcast android:name="com.android.server.wifi.ConnectToNetworkNotification.USER_DISMISSED_NOTIFICATION" />
     <protected-broadcast android:name="com.android.server.wifi.ConnectToNetworkNotification.CONNECT_TO_NETWORK" />
     <protected-broadcast android:name="com.android.server.wifi.ConnectToNetworkNotification.PICK_WIFI_NETWORK" />