From 20a7e0c617f07a22bfde280dc6dc825bb9255fff Mon Sep 17 00:00:00 2001
From: "Nate(Qiang) Jiang" <qiangjiang@google.com>
Date: Thu, 23 Jan 2020 18:28:30 -0800
Subject: [PATCH] [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: 142001564
Test: atest android.net.wifi
Test: atest com.android.server.wifi
Change-Id: I1b926ddcc0878be37c573c697fa5498715221413
---
 core/res/AndroidManifest.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 4595bab824658..e19fef08683f9 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -350,6 +350,8 @@
     <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.action.NetworkSuggestion.USER_ALLOWED_CARRIER" />
+    <protected-broadcast android:name="com.android.server.wifi.action.NetworkSuggestion.USER_DISALLOWED_CARRIER" />
     <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" />