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

Merge changes I8194476e,I9d21909f

Browse Source 
* changes:
  [Wi-Fi] Fix some test failures of com.android.settings.wifi.details2
  [Wi-Fi] Remove passpoint methods in WifiEntryShell
This commit is contained in:
TreeHugger Robot
2020-02-01 05:24:09 +00:00
committed by Android (Google) Code Review
parent 86272795f3 41ff138c21
commit b7f0145c02
4 changed files with 10 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -537,7 +537,7 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
}
private void refreshSsid() {
if (mWifiEntry.isSubscription() || WifiEntryShell.isOsuProvider(mWifiEntry)) {
if (mWifiEntry.isSubscription()) {
mSsidPref.setVisible(true);
mSsidPref.setSummary(mWifiEntry.getTitle());
} else {
@@ -743,8 +743,7 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
try {
mWifiEntry.forget(this);
} catch (RuntimeException e) {
Log.e(TAG, "Failed to remove Passpoint configuration for "
+ WifiEntryShell.getPasspointFqdn(mWifiEntry));
Log.e(TAG, "Failed to remove Passpoint configuration: " + e);
}
mMetricsFeatureProvider.action(
mFragment.getActivity(), SettingsEnums.ACTION_WIFI_FORGET);