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

Merge "Improve the wifi description for the case of private DNS broken" am: 37b17ae752

Browse Source 
am: 5eda5a3e7f

Change-Id: Idd568b71dab954a6b018594e15d3f695ea2aeac2
This commit is contained in:
Lucas Lin
2019-10-23 03:07:20 -07:00
committed by android-build-merger
parent f72fb5a049 5eda5a3e7f
commit 9b29332cd3
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
View File

@@ -235,14 +235,28 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
return mNetworkCapabilities.hasCapability(cap) != nc.hasCapability(cap); return mNetworkCapabilities.hasCapability(cap) != nc.hasCapability(cap);
} }
private boolean hasPrivateDnsStatusChanged(NetworkCapabilities nc) {
// If this is the first time that WifiDetailPreferenceController gets
// NetworkCapabilities, report that something has changed and assign nc to
// mNetworkCapabilities in onCapabilitiesChanged. Note that the NetworkCapabilities
// from onCapabilitiesChanged() will never be null, so calling
// mNetworkCapabilities.isPrivateDnsBroken() would be safe next time.
if (mNetworkCapabilities == null) {
return true;
}
return mNetworkCapabilities.isPrivateDnsBroken() != nc.isPrivateDnsBroken();
}
@Override @Override
public void onCapabilitiesChanged(Network network, NetworkCapabilities nc) { public void onCapabilitiesChanged(Network network, NetworkCapabilities nc) {
// If the network just validated or lost Internet access or detected partial internet // If the network just validated or lost Internet access or detected partial internet
// connectivity, refresh network state. Don't do this on every NetworkCapabilities // connectivity or private dns was broken, refresh network state. Don't do this on
// change because refreshNetworkState sends IPCs to the system server from the UI // every NetworkCapabilities change because refreshEntityHeader sends IPCs to the
// thread, which can cause jank. // system server from the UI thread, which can cause jank.
if (network.equals(mNetwork) && !nc.equals(mNetworkCapabilities)) { if (network.equals(mNetwork) && !nc.equals(mNetworkCapabilities)) {
if (hasCapabilityChanged(nc, NET_CAPABILITY_VALIDATED) if (hasPrivateDnsStatusChanged(nc)
|| hasCapabilityChanged(nc, NET_CAPABILITY_VALIDATED)
|| hasCapabilityChanged(nc, NET_CAPABILITY_CAPTIVE_PORTAL) || hasCapabilityChanged(nc, NET_CAPABILITY_CAPTIVE_PORTAL)
|| hasCapabilityChanged(nc, NET_CAPABILITY_PARTIAL_CONNECTIVITY)) { || hasCapabilityChanged(nc, NET_CAPABILITY_PARTIAL_CONNECTIVITY)) {
mAccessPoint.update(mWifiConfig, mWifiInfo, mNetworkInfo); mAccessPoint.update(mWifiConfig, mWifiInfo, mNetworkInfo);

8
tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
View File

@@ -993,6 +993,14 @@ public class WifiDetailPreferenceControllerTest {
updateNetworkCapabilities(nc); updateNetworkCapabilities(nc);
inOrder.verify(mockHeaderController).setSummary(summary); inOrder.verify(mockHeaderController).setSummary(summary);
// UI will be refreshed when private DNS is broken.
summary = "Private DNS server cannot be accessed";
when(mockAccessPoint.getSettingsSummary(true /* convertSavedAsDisconnected */))
.thenReturn(summary);
nc.setPrivateDnsBroken(true);
updateNetworkCapabilities(nc);
inOrder.verify(mockHeaderController).setSummary(summary);
// UI will be refreshed when device connects to a partial connectivity network. // UI will be refreshed when device connects to a partial connectivity network.
summary = "Limited connection"; summary = "Limited connection";
when(mockAccessPoint.getSettingsSummary(true /*convertSavedAsDisconnected*/)) when(mockAccessPoint.getSettingsSummary(true /*convertSavedAsDisconnected*/))