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

am: 767b96670d

Change-Id: Ie89a24a820a459c0ee41d17b07d4a37c82d76c99
This commit is contained in:
Quang Luong
2019-07-31 13:34:19 -07:00
committed by android-build-merger

View File

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