drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Slightly simplify IpManager#compareProvisioning.

Browse Source 
Bug: 31827713
Change-Id: Icc1c8d98feef14c972891451fd94f855d78de43e
This commit is contained in:
Lorenzo Colitti
2016-10-04 01:38:15 +09:00
parent 5b437d6ff9
commit b77b775213
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/net/java/android/net/ip/IpManager.java
View File

@ -684,6 +684,10 @@ public class IpManager extends StateMachine {
delta = ProvisioningChange.LOST_PROVISIONING; delta = ProvisioningChange.LOST_PROVISIONING;
} }
final boolean lostIPv6 = oldLp.isIPv6Provisioned() && !newLp.isIPv6Provisioned();
final boolean lostIPv4Address = oldLp.hasIPv4Address() && !newLp.hasIPv4Address();
final boolean lostIPv6Router = oldLp.hasIPv6DefaultRoute() && !newLp.hasIPv6DefaultRoute();
// Additionally: // Additionally:
// //
// Partial configurations (e.g., only an IPv4 address with no DNS // Partial configurations (e.g., only an IPv4 address with no DNS
@ -696,8 +700,7 @@ public class IpManager extends StateMachine {
// Because on such a network isProvisioned() will always return false, // Because on such a network isProvisioned() will always return false,
// delta will never be LOST_PROVISIONING. So check for loss of // delta will never be LOST_PROVISIONING. So check for loss of
// provisioning here too. // provisioning here too.
if ((oldLp.hasIPv4Address() && !newLp.hasIPv4Address()) || if (lostIPv4Address || lostIPv6) {
(oldLp.isIPv6Provisioned() && !newLp.isIPv6Provisioned())) {
delta = ProvisioningChange.LOST_PROVISIONING; delta = ProvisioningChange.LOST_PROVISIONING;
} }
@ -706,8 +709,7 @@ public class IpManager extends StateMachine {
// If the previous link properties had a global IPv6 address and an // If the previous link properties had a global IPv6 address and an
// IPv6 default route then also consider the loss of that default route // IPv6 default route then also consider the loss of that default route
// to be a loss of provisioning. See b/27962810. // to be a loss of provisioning. See b/27962810.
if (oldLp.hasGlobalIPv6Address() && oldLp.hasIPv6DefaultRoute() && if (oldLp.hasGlobalIPv6Address() && lostIPv6Router) {
!newLp.hasIPv6DefaultRoute()) {
delta = ProvisioningChange.LOST_PROVISIONING; delta = ProvisioningChange.LOST_PROVISIONING;
} }