PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Bug: 143326832
Bug: 146407136
Bug: 147781156
Test: manual
      Check if security information correct

Change-Id: I32c247763783a38fed14eb06de863d9819cd6bdd
This commit is contained in:
Arc Wang
2020-01-17 17:12:05 +08:00
parent af2e3afb04
commit 33c6e65371
3 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/wifi/WifiConfigController2.java
View File

@@ -411,7 +411,7 @@ public class WifiConfigController2 implements TextWatcher,
} }
addRow(group, R.string.wifi_security, addRow(group, R.string.wifi_security,
WifiEntryShell.getSecurityString(mWifiEntry, false)); mWifiEntry.getSecurityString(false /* concise */));
mView.findViewById(R.id.ip_fields).setVisibility(View.GONE); mView.findViewById(R.id.ip_fields).setVisibility(View.GONE);
} }
if (mWifiEntry.isSaved() if (mWifiEntry.isSaved()

7
src/com/android/settings/wifi/WifiEntryShell.java
View File

@@ -48,13 +48,6 @@ public class WifiEntryShell {
*/ */
public static final int HIGHER_FREQ_5GHZ = 5900; 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 // Passpoint methods
/** /**

2
src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
View File

@@ -330,7 +330,7 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
mIpv6Category = screen.findPreference(KEY_IPV6_CATEGORY); mIpv6Category = screen.findPreference(KEY_IPV6_CATEGORY);
mIpv6AddressPref = screen.findPreference(KEY_IPV6_ADDRESSES_PREF); 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) { private void setupEntityHeader(PreferenceScreen screen) {