diff options
| author | 2021-01-06 19:39:39 -0800 | |
|---|---|---|
| committer | 2021-01-12 16:33:26 -0800 | |
| commit | d10ce033c9a543a433151bbeff2154fb47ebc5ef (patch) | |
| tree | 67ab976c553114426d463c04ac2b2c12c4bd76a0 | |
| parent | 097aef6f10f5a9e7219bf85ba58e1889cd4526ca (diff) | |
CarrierConfig KEY_SUGGESTION_SSID_LIST_WITH_MAC_RANDOMIZATION_DISABLED
MAC randomization will be disabled for WifiNetworkSuggestions with SSID
in this list.
This is meant to be used only on a few widely known networks that do not
supoort MAC randmozation
Bug: 171928471
Test: atest com.android.server.wifi
Change-Id: I5d7ae9329d67e188f87cf6d99dcd058ebc58ab88
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 16 |
2 files changed, 17 insertions, 0 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 1553214bc2eb..85f6e46f1015 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -10359,6 +10359,7 @@ package android.telephony { public static final class CarrierConfigManager.Wifi { field public static final String KEY_HOTSPOT_MAX_CLIENT_COUNT = "wifi.hotspot_maximum_client_count"; field public static final String KEY_PREFIX = "wifi."; + field public static final String KEY_SUGGESTION_SSID_LIST_WITH_MAC_RANDOMIZATION_DISABLED = "wifi.suggestion_ssid_list_with_mac_randomization_disabled"; } public final class CarrierRestrictionRules implements android.os.Parcelable { diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 56345c032670..7605f78665e1 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -5152,9 +5152,25 @@ public class CarrierConfigManager { public static final String KEY_HOTSPOT_MAX_CLIENT_COUNT = KEY_PREFIX + "hotspot_maximum_client_count"; + /** + * This configuration is intended to be a narrow exception for provisioning + * {@link android.net.wifi.WifiNetworkSuggestion} of widely-known carrier networks that do + * not support using randomized MAC address. + * Carrier provisioned {@link android.net.wifi.WifiNetworkSuggestion} with SSIDs included + * in this list will have MAC randomization disabled. + * + * Note: the SSIDs in the list are expected to be interpreted as is - do not add double + * quotes to the SSIDs. + */ + public static final String KEY_SUGGESTION_SSID_LIST_WITH_MAC_RANDOMIZATION_DISABLED = + KEY_PREFIX + "suggestion_ssid_list_with_mac_randomization_disabled"; + private static PersistableBundle getDefaults() { PersistableBundle defaults = new PersistableBundle(); defaults.putInt(KEY_HOTSPOT_MAX_CLIENT_COUNT, 0); + defaults.putStringArray(KEY_SUGGESTION_SSID_LIST_WITH_MAC_RANDOMIZATION_DISABLED, + new String[0]); + return defaults; } |