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

Commit 04dd29fc authored by Roshan Pius's avatar Roshan Pius Committed by Android (Google) Code Review
Browse files

Merge "AccessPoint: App attribution for suggestion/specifier"

parents 3dc845a1 896cfd53

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

+9 −1
Original line number Diff line number Diff line
@@ -359,8 +359,16 @@ public class WifiConfigController implements TextWatcher, 
                        if (config != null && config.isPasspoint()) {

                            providerFriendlyName = config.providerFriendlyName;

                        }

                        String suggestionOrSpecifierPackageName = null;

                        if (config != null

                                && (config.fromWifiNetworkSpecifier

                                || config.fromWifiNetworkSuggestion)) {

                            suggestionOrSpecifierPackageName = config.creatorName;

                        }

                        String summary = AccessPoint.getSummary(

                                mConfigUi.getContext(), state, isEphemeral, providerFriendlyName);

                                mConfigUi.getContext(), state, isEphemeral,

                                suggestionOrSpecifierPackageName,

                                providerFriendlyName);

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

                    }

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

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

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

            mNetworkState.setText(summary);

        }

    }