Merge "Do not detect portals when DNS returns private IPs" am: a9068317c9 am: b52e03889a

Change-Id: Iaa65370031138a4f16743d899228ee284cdda468

1 files changed, 12 insertions, 0 deletions

diff --git a/common/captiveportal/src/android/net/captiveportal/CaptivePortalProbeResult.java b/common/captiveportal/src/android/net/captiveportal/CaptivePortalProbeResult.java
index 48cd48b3..deee91aa 100644..100755
--- a/common/captiveportal/src/android/net/captiveportal/CaptivePortalProbeResult.java
+++ b/common/captiveportal/src/android/net/captiveportal/CaptivePortalProbeResult.java
@@ -36,6 +36,12 @@ public final class CaptivePortalProbeResult {
      */
     public static final int PARTIAL_CODE = -1;
 
+    // DNS response with private IP on the probe URL means the network, especially Wi-Fi network is
+    // not connected to the Internet. This code represents the result of a single probe, for correct
+    // logging of the probe results. The result of the whole evaluation would typically be FAILED if
+    // one of the probes returns this status.
+    public static final int DNS_PRIVATE_IP_RESPONSE_CODE = -2;
+
     @NonNull
     public static final CaptivePortalProbeResult FAILED = new CaptivePortalProbeResult(FAILED_CODE);
     @NonNull
@@ -43,6 +49,8 @@ public final class CaptivePortalProbeResult {
             new CaptivePortalProbeResult(SUCCESS_CODE);
     public static final CaptivePortalProbeResult PARTIAL =
             new CaptivePortalProbeResult(PARTIAL_CODE);
+    public static final CaptivePortalProbeResult PRIVATE_IP =
+            new CaptivePortalProbeResult(DNS_PRIVATE_IP_RESPONSE_CODE);
 
     private final int mHttpResponseCode;  // HTTP response code returned from Internet probe.
     @Nullable
@@ -85,4 +93,8 @@ public final class CaptivePortalProbeResult {
     public boolean isPartialConnectivity() {
         return mHttpResponseCode == PARTIAL_CODE;
     }
+
+    public boolean isDnsPrivateIpResponse() {
+        return mHttpResponseCode == DNS_PRIVATE_IP_RESPONSE_CODE;
+    }
 }