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

Commit 11324dce authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Fix network name for Passpoint network" am: 742bd03f 

am: a41debea

Change-Id: I6cffc06b4d792501fd3cc158cbc119b3c388c9be
parents dd48f602 a41debea

src/com/android/settings/datausage/DataUsageMeteredSettings.java

+2 −1
Original line number Diff line number Diff line
@@ -114,7 +114,8 @@ public class DataUsageMeteredSettings extends SettingsPreferenceFragment impleme 
    }



    private Preference buildWifiPref(Context context, WifiConfiguration config) {

        final String networkId = config.SSID;

        final String networkId = config.isPasspoint() ?

                config.providerFriendlyName : config.SSID;

        final NetworkTemplate template = NetworkTemplate.buildTemplateWifi(networkId);

        final MeteredPreference pref = new MeteredPreference(context, template);

        pref.setTitle(removeDoubleQuotes(networkId));