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

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

Merge "Fix network name for Passpoint network" 

am: 742bd03f

Change-Id: Ia9ae9d6034f72be5f8d34340efce5b52d71fa6c2
parents 015fe72c 742bd03f

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));