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

Merge "Do not set AccessPoint.ssid to config.SSID for Passpoint networks" into qt-r1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-07-31 20:05:26 +00:00
committed by Android (Google) Code Review
parent 545bd4dee3 c825db1194
commit 767b96670d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
View File

@@ -1435,7 +1435,7 @@ public class AccessPoint implements Comparable<AccessPoint> {
void update(@Nullable WifiConfiguration config) { void update(@Nullable WifiConfiguration config) {
mConfig = config; mConfig = config;
if (mConfig != null) { if (mConfig != null && !isPasspoint()) {
ssid = removeDoubleQuotes(mConfig.SSID); ssid = removeDoubleQuotes(mConfig.SSID);
} }
networkId = config != null ? config.networkId : WifiConfiguration.INVALID_NETWORK_ID; networkId = config != null ? config.networkId : WifiConfiguration.INVALID_NETWORK_ID;