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

Commit 6f229435 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Handle switch of ssid to CharSequence (for spans)" into mnc-dev

parents 04e3fca3 c68b46c1

src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ public class SavedAccessPointsWifiSettings extends SettingsPreferenceFragment 
                final int accessPointsSize = accessPoints.size();

                for (int i = 0; i < accessPointsSize; ++i){

                    data = new SearchIndexableRaw(context);

                    data.title = accessPoints.get(i).getSsid();

                    data.title = accessPoints.get(i).getSsidStr();

                    data.screenTitle = title;

                    data.enabled = enabled;

                    result.add(data);

src/com/android/settings/wifi/WifiConfigController.java

+1 −1
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ public class WifiConfigController implements TextWatcher, 
            config.hiddenSSID = true;

        } else if (!mAccessPoint.isSaved()) {

            config.SSID = AccessPoint.convertToQuotedString(

                    mAccessPoint.getSsid());

                    mAccessPoint.getSsidStr());

        } else {

            config.networkId = mAccessPoint.getConfig().networkId;

        }

src/com/android/settings/wifi/WifiSettings.java

+2 −2
Original line number Diff line number Diff line
@@ -820,7 +820,7 @@ public class WifiSettings extends RestrictedSettingsFragment 
                    mSelectedAccessPoint.getNetworkInfo().getState() != State.DISCONNECTED) {

                // Network is active but has no network ID - must be ephemeral.

                mWifiManager.disableEphemeralNetwork(

                        AccessPoint.convertToQuotedString(mSelectedAccessPoint.getSsid()));

                        AccessPoint.convertToQuotedString(mSelectedAccessPoint.getSsidStr()));

            } else {

                // Should not happen, but a monkey seems to trigger it

                Log.e(TAG, "Failed to forget invalid network " + mSelectedAccessPoint.getConfig());
@@ -922,7 +922,7 @@ public class WifiSettings extends RestrictedSettingsFragment 
                        WifiTracker.getCurrentAccessPoints(context, true, false, false);

                for (AccessPoint accessPoint : accessPoints) {

                    data = new SearchIndexableRaw(context);

                    data.title = accessPoint.getSsid();

                    data.title = accessPoint.getSsidStr();

                    data.screenTitle = res.getString(R.string.wifi_settings);

                    data.enabled = enabled;

                    result.add(data);