Merge "Do not set AccessPoint.ssid to config.SSID for Passpoint networks" into qt-r1-dev am: 767b96670d am: 96b69856e0

am: 178b4414f2

Change-Id: Iaae2e5485737a90ff866728389cc1186c1611d5a
This commit is contained in:
Quang Luong
2019-07-31 15:01:27 -07:00
committed by android-build-merger

View File

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