Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '386effc7a160e330420f7746f41d46c12f64579d':
  Fix flipped captive portal bit in network conditions bcast.
This commit is contained in:
Jeff Davidson
2014-12-08 19:36:39 +00:00
committed by Android Git Automerger
parent 820ba1f96f 386effc7a1
commit 0efd29fc57
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/connectivity/NetworkMonitor.java
View File

@@ -678,7 +678,8 @@ public class NetworkMonitor extends StateMachine {
httpResponseCode = 204; httpResponseCode = 204;
} }
sendNetworkConditionsBroadcast(true /* response received */, httpResponseCode == 204, sendNetworkConditionsBroadcast(true /* response received */,
httpResponseCode != 204 /* isCaptivePortal */,
requestTimestamp, responseTimestamp); requestTimestamp, responseTimestamp);
} catch (IOException e) { } catch (IOException e) {
if (DBG) log("Probably not a portal: exception " + e); if (DBG) log("Probably not a portal: exception " + e);