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

Commit 7b7fcdcf authored by Quang Luong's avatar Quang Luong Committed by android-build-merger
Browse files

Merge "Do not set AccessPoint.ssid to config.SSID for Passpoint networks" into... 

Merge "Do not set AccessPoint.ssid to config.SSID for Passpoint networks" into qt-r1-dev am: 767b9667 am: 96b69856
am: 178b4414

Change-Id: Iaae2e5485737a90ff866728389cc1186c1611d5a
parents 84e8e76e 178b4414

packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -1434,7 +1434,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;