diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-17 19:33:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-17 19:33:03 +0000 |
| commit | 41c8058406f2de77c0105cd4a82c4ad1dd00fcfa (patch) | |
| tree | 11570cecf747e757536c40196517c811cb87afef | |
| parent | 004d0bb26f44f0265477909e6119673a5a8df76c (diff) | |
| parent | d696694b98f70b7d6ec2c66f0349e557e5c5b6b0 (diff) | |
Merge "RESTRICT AUTOMERGE WIFI_CREDENTIAL_CHANGED_ACTION: only broadcast SSID if location mode is enabled & receiver has location permissions" into rvc-dev
| -rw-r--r-- | service/java/com/android/server/wifi/ClientModeImpl.java | 11 | ||||
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java | 1 |
2 files changed, 9 insertions, 3 deletions
diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java index f09218ab9..82851b238 100644 --- a/service/java/com/android/server/wifi/ClientModeImpl.java +++ b/service/java/com/android/server/wifi/ClientModeImpl.java @@ -5808,12 +5808,17 @@ public class ClientModeImpl extends StateMachine { private void broadcastWifiCredentialChanged(int wifiCredentialEventType, WifiConfiguration config) { Intent intent = new Intent(WifiManager.WIFI_CREDENTIAL_CHANGED_ACTION); - if (config != null && config.SSID != null) { + if (config != null && config.SSID != null && mWifiPermissionsUtil.isLocationModeEnabled()) { intent.putExtra(WifiManager.EXTRA_WIFI_CREDENTIAL_SSID, config.SSID); } intent.putExtra(WifiManager.EXTRA_WIFI_CREDENTIAL_EVENT_TYPE, wifiCredentialEventType); - mContext.sendBroadcastAsUser(intent, UserHandle.CURRENT, - android.Manifest.permission.RECEIVE_WIFI_CREDENTIAL_CHANGE); + mContext.createContextAsUser(UserHandle.CURRENT, 0) + .sendBroadcastWithMultiplePermissions( + intent, + new String[]{ + android.Manifest.permission.RECEIVE_WIFI_CREDENTIAL_CHANGE, + android.Manifest.permission.ACCESS_FINE_LOCATION, + }); } void handleGsmAuthRequest(SimAuthRequestData requestData) { diff --git a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java index 58f5b1ccc..11ee5cd7c 100644 --- a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java @@ -521,6 +521,7 @@ public class ClientModeImplTest extends WifiBaseTest { RssiUtilTest.RSSI_THRESHOLDS); mResources.setInteger(R.integer.config_wifiPollRssiIntervalMilliseconds, 3000); when(mContext.getResources()).thenReturn(mResources); + when(mContext.createContextAsUser(any(), anyInt())).thenReturn(mContext); when(mFrameworkFacade.getIntegerSetting(mContext, Settings.Global.WIFI_FREQUENCY_BAND, |