Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67407037 authored by Oscar Shu's avatar Oscar Shu Committed by Android (Google) Code Review
Browse files

Merge "CarrierConfig KEY_SUGGESTION_SSID_LIST_WITH_MAC_RANDOMIZATION_DISABLED"

parents 7b956dd6 d10ce033

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10588,6 +10588,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 {

























telephony/java/android/telephony/CarrierConfigManager.java



+16
−0




























Original line number
Diff line number
Diff line








@@ -5219,9 +5219,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;















        }