am f779e6b8: Merge "Fix flipped captive portal bit in network conditions bcast." into lmp-mr1-dev

* commit 'f779e6b8ac827d923e3e7905045ad5c35512c535': Fix flipped captive portal bit in network conditions bcast.
2014-12-06 02:10:49 +00:00
parent 401ef259f3 f779e6b8ac
commit 386effc7a1
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/connectivity/NetworkMonitor.java
+++ b/services/core/java/com/android/server/connectivity/NetworkMonitor.java
@@ -678,7 +678,8 @@ public class NetworkMonitor extends StateMachine {
                httpResponseCode = 204;
            }

-            sendNetworkConditionsBroadcast(true /* response received */, httpResponseCode == 204,
+            sendNetworkConditionsBroadcast(true /* response received */,
+                    httpResponseCode != 204 /* isCaptivePortal */,
                    requestTimestamp, responseTimestamp);
        } catch (IOException e) {
            if (DBG) log("Probably not a portal: exception " + e);