From f9fff92d70d20644c5263563f1d0827eaf3315f6 Mon Sep 17 00:00:00 2001 From: Jeff Davidson Date: Fri, 5 Dec 2014 16:56:08 -0800 Subject: [PATCH] Fix flipped captive portal bit in network conditions bcast. Bug: 18651036 Change-Id: I191fcafab1fc5ba65be06359da1edc7ca5aabc6a --- .../java/com/android/server/connectivity/NetworkMonitor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/connectivity/NetworkMonitor.java b/services/core/java/com/android/server/connectivity/NetworkMonitor.java index 39718ea58c16b..9fa362c8776dc 100644 --- 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);