diff options
| author | David Su <dysu@google.com> | 2020-09-28 19:55:29 -0700 |
|---|---|---|
| committer | Anis Assi <anisassi@google.com> | 2020-10-08 17:09:04 -0700 |
| commit | 4456ad496d21c41c822f4256d0d780f738856f6f (patch) | |
| tree | f2387730f473f895b22b55264e8d622e09ba02d0 | |
| parent | 63cc25763fd7f0e51d9c00f0b32afeffd0061e8f (diff) | |
| download | wifi-4456ad496d21c41c822f4256d0d780f738856f6f.tar.gz | |
WifiConfigManager: protect CONFIGURED_NETWORKS_CHANGED_ACTION with permissionsandroid-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63
Guard with ACCESS_WIFI_STATE & ACCESS_FINE_LOCATION permissions.
Bug: 158874479
Bug: 159373687
Test: presubmit unit tests
Test: Verify Settings still works correctly.
Change-Id: I88d93006ff379105e13e1b339ec51757a56ac863
Merged-In: I657063f68701d57cfeb3765dfbab25ba50ef7b97
(cherry picked from commit ff831c8e8dff31c14b418cce9cfd238f46f5152f)
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigManager.java | 8 | ||||
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java index 0b70dbf4e..33473bef6 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -657,7 +657,13 @@ public class WifiConfigManager { maskPasswordsInWifiConfiguration(broadcastNetwork); intent.putExtra(WifiManager.EXTRA_WIFI_CONFIGURATION, broadcastNetwork); intent.putExtra(WifiManager.EXTRA_CHANGE_REASON, reason); - mContext.sendBroadcastAsUser(intent, UserHandle.ALL); + mContext.sendBroadcastAsUserMultiplePermissions( + intent, + UserHandle.ALL, + new String[]{ + android.Manifest.permission.ACCESS_WIFI_STATE, + android.Manifest.permission.ACCESS_FINE_LOCATION, + }); } /** diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java index a4bc61aa1..ca1b4a07c 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java @@ -3844,8 +3844,8 @@ public class WifiConfigManagerTest { private int verifyNetworkInBroadcastAndReturnReason(WifiConfiguration configuration) { ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class); ArgumentCaptor<UserHandle> userHandleCaptor = ArgumentCaptor.forClass(UserHandle.class); - mContextConfigStoreMockOrder.verify(mContext) - .sendBroadcastAsUser(intentCaptor.capture(), userHandleCaptor.capture()); + mContextConfigStoreMockOrder.verify(mContext).sendBroadcastAsUserMultiplePermissions( + intentCaptor.capture(), userHandleCaptor.capture(), any()); assertEquals(userHandleCaptor.getValue(), UserHandle.ALL); Intent intent = intentCaptor.getValue(); |