Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-02-15 00:23:14 +00:00
committed by Android (Google) Code Review
parent 7bc32e7dc9 fb39c5de57
commit 7f11596f0a
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -11076,6 +11076,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";

17
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -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;
}