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

Commit fd9cdb50 authored by Quang Luong's avatar Quang Luong Committed by Android (Google) Code Review
Browse files

Merge "Updated arguments for AccessPoint.getSummary calls"

parents 158fd441 cb0b08aa

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

+2 −3
Original line number Diff line number Diff line
@@ -366,9 +366,8 @@ public class WifiConfigController implements TextWatcher, 
                            suggestionOrSpecifierPackageName = config.creatorName;

                        }

                        String summary = AccessPoint.getSummary(

                                mConfigUi.getContext(), state, isEphemeral,

                                suggestionOrSpecifierPackageName,

                                providerFriendlyName);

                                mConfigUi.getContext(), /* ssid */ null, state, isEphemeral,

                                suggestionOrSpecifierPackageName);

                        addRow(group, R.string.wifi_status, summary);

                    }

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

+2 −1
Original line number Diff line number Diff line
@@ -299,7 +299,8 @@ public class WifiStatusTest extends Activity { 
            WifiInfo info = mWifiManager.getConnectionInfo();

            String summary = AccessPoint.getSummary(this, info.getSSID(),

                    networkInfo.getDetailedState(),

                    info.getNetworkId() == WifiConfiguration.INVALID_NETWORK_ID, null, null);

                    info.getNetworkId() == WifiConfiguration.INVALID_NETWORK_ID,

                    /* suggestionOrSpecifierPackageName */ null);

            mNetworkState.setText(summary);

        }

    }