diff options
| author | David Su <dysu@google.com> | 2020-09-28 19:55:29 -0700 |
|---|---|---|
| committer | David Su <dysu@google.com> | 2020-11-03 16:51:14 +0000 |
| commit | 36f37a333f9e6332d0ce5944a422e30e7bfbfdd6 (patch) | |
| tree | ad86bb717ab40d5ca4435fe20b5e9503a7765bad | |
| parent | fc71b41e1ab324388a1e827663f9928b698d9135 (diff) | |
| download | wifi-android10-gsi.tar.gz | |
DO NOT MERGE WifiConfigManager: protect CONFIGURED_NETWORKS_CHANGED_ACTION with permissionsandroid10-gsi
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
(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 9472367fb..8dcd1c19d 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -830,7 +830,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 6a7785e5e..0f48af9cc 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java @@ -4899,8 +4899,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(); |