Merge "Also consider loss of IPv6 default route to be fatal" into nyc-dev

2016-04-14 00:51:07 +00:00
parent c1699a9f4c 0a0e1dcdc6
commit 7596e9cdff
1 changed files with 10 additions and 0 deletions
--- a/services/net/java/android/net/ip/IpManager.java
+++ b/services/net/java/android/net/ip/IpManager.java
@@ -536,6 +536,16 @@ public class IpManager extends StateMachine {
            delta = ProvisioningChange.LOST_PROVISIONING;
        }

+        // Additionally:
+        //
+        // If the previous link properties had a global IPv6 address and an
+        // IPv6 default route then also consider the loss of that default route
+        // to be a loss of provisioning. See b/27962810.
+        if (oldLp.hasGlobalIPv6Address() && oldLp.hasIPv6DefaultRoute() &&
+                !newLp.hasIPv6DefaultRoute()) {
+            delta = ProvisioningChange.LOST_PROVISIONING;
+        }
+
        return delta;
    }