diff options
| author | Jeff Davidson <jpd@google.com> | 2014-12-05 16:56:08 -0800 |
|---|---|---|
| committer | Jeff Davidson <jpd@google.com> | 2014-12-05 16:56:08 -0800 |
| commit | f9fff92d70d20644c5263563f1d0827eaf3315f6 (patch) | |
| tree | a86227be011f851afcc83e714bf52cf94c35d8f0 /services/core/java/com/android/server/connectivity/NetworkMonitor.java | |
| parent | 647b437d0772a8c73ac3936b2f8e69d4bd1953d3 (diff) | |
| download | frameworks_base-f9fff92d70d20644c5263563f1d0827eaf3315f6.zip frameworks_base-f9fff92d70d20644c5263563f1d0827eaf3315f6.tar.gz frameworks_base-f9fff92d70d20644c5263563f1d0827eaf3315f6.tar.bz2 | |
Fix flipped captive portal bit in network conditions bcast.
Bug: 18651036
Change-Id: I191fcafab1fc5ba65be06359da1edc7ca5aabc6a
Diffstat (limited to 'services/core/java/com/android/server/connectivity/NetworkMonitor.java')
| -rw-r--r-- | services/core/java/com/android/server/connectivity/NetworkMonitor.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/connectivity/NetworkMonitor.java b/services/core/java/com/android/server/connectivity/NetworkMonitor.java index 39718ea..9fa362c 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); |