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

Commit ed4dd70f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Wi-Fi] Replace WifiEntryShell#getSecurityString with WifiEntry#getSecurityString"

parents f160cbed 33c6e653

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

+1 −1
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ public class WifiConfigController2 implements TextWatcher, 
                    }



                    addRow(group, R.string.wifi_security,

                            WifiEntryShell.getSecurityString(mWifiEntry, false));

                            mWifiEntry.getSecurityString(false /* concise */));

                    mView.findViewById(R.id.ip_fields).setVisibility(View.GONE);

                }

                if (mWifiEntry.isSaved()

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

+0 −7
Original line number Diff line number Diff line
@@ -48,13 +48,6 @@ public class WifiEntryShell { 
     */

    public static final int HIGHER_FREQ_5GHZ = 5900;



    /**

     * Mapping of the corresponding {@link AccessPoint} method

     */

    public static String getSecurityString(WifiEntry wifiEntry, boolean concise) {

        return "None";

    }



    // Passpoint methods



    /**

src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle 
        mIpv6Category = screen.findPreference(KEY_IPV6_CATEGORY);

        mIpv6AddressPref = screen.findPreference(KEY_IPV6_ADDRESSES_PREF);



        mSecurityPref.setSummary(WifiEntryShell.getSecurityString(mWifiEntry, /* concise */ false));

        mSecurityPref.setSummary(mWifiEntry.getSecurityString(false /* concise */));

    }



    private void setupEntityHeader(PreferenceScreen screen) {