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

Merge "Assign StaticIpConfiguration builder value to global variable" into sc-dev am: 35e244754c

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419452

Change-Id: I741e567bf6b1dc2440b106cb55cc39cc83b55813
This commit is contained in:
Betty Chang
2021-05-04 14:16:39 +00:00
committed by Automerger Merge Worker
parent 722ac92514 35e244754c
commit 26fcdf4745
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -923,7 +923,6 @@ public class WifiConfigController2 implements TextWatcher,
return R.string.wifi_ip_settings_invalid_dns; return R.string.wifi_ip_settings_invalid_dns;
} }
dnsServers.add(dnsAddr); dnsServers.add(dnsAddr);
staticIpConfiguration.getDnsServers().add(dnsAddr);
} }
if (mDns2View.length() > 0) { if (mDns2View.length() > 0) {
@@ -933,14 +932,13 @@ public class WifiConfigController2 implements TextWatcher,
return R.string.wifi_ip_settings_invalid_dns; return R.string.wifi_ip_settings_invalid_dns;
} }
dnsServers.add(dnsAddr); dnsServers.add(dnsAddr);
staticIpConfiguration.getDnsServers().add(dnsAddr);
} }
staticIPBuilder.setDnsServers(dnsServers); staticIPBuilder.setDnsServers(dnsServers);
return 0; return 0;
} finally { } finally {
// Caller of this method may rely on staticIpConfiguration, so build the final result // Caller of this method may rely on staticIpConfiguration, so build the final result
// at the end of the method. // at the end of the method.
staticIpConfiguration = staticIPBuilder.build(); mStaticIpConfiguration = staticIPBuilder.build();
} }
} }