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

Commit f31c9583 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[WifiCoex] Add carrier config flags for 5GHz Wifi/LAA coex" into sc-dev am: 7f11596f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13428600

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1136a35ed8f0f60ade409ebe08e35722ff4e15bd
parents 9588e8a8 7f11596f

core/api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -11079,6 +11079,8 @@ package android.telephony { 
  }















  public static final class CarrierConfigManager.Wifi {













    field public static final String KEY_AVOID_5GHZ_SOFTAP_FOR_LAA_BOOL = "wifi.avoid_5ghz_softap_for_laa_bool";













    field public static final String KEY_AVOID_5GHZ_WIFI_DIRECT_FOR_LAA_BOOL = "wifi.avoid_5ghz_wifi_direct_for_laa_bool";















    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";

























telephony/java/android/telephony/CarrierConfigManager.java



+17
−0




























Original line number
Diff line number
Diff line








@@ -5351,11 +5351,28 @@ public class CarrierConfigManager {













        public static final String KEY_SUGGESTION_SSID_LIST_WITH_MAC_RANDOMIZATION_DISABLED =















                KEY_PREFIX + "suggestion_ssid_list_with_mac_randomization_disabled";





























        /**













         * Avoid SoftAp in 5GHz if cellular is on unlicensed 5Ghz using License Assisted Access













         * (LAA).













         */













        public static final String KEY_AVOID_5GHZ_SOFTAP_FOR_LAA_BOOL =













                KEY_PREFIX + "avoid_5ghz_softap_for_laa_bool";



























        /**













         * Avoid Wifi Direct in 5GHz if cellular is on unlicensed 5Ghz using License Assisted













         * Access (LAA).













         */













        public static final String KEY_AVOID_5GHZ_WIFI_DIRECT_FOR_LAA_BOOL =













                KEY_PREFIX + "avoid_5ghz_wifi_direct_for_laa_bool";











































        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]);













            defaults.putBoolean(KEY_AVOID_5GHZ_SOFTAP_FOR_LAA_BOOL, false);













            defaults.putBoolean(KEY_AVOID_5GHZ_WIFI_DIRECT_FOR_LAA_BOOL, false);































            return defaults;















        }