Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4520f656 authored by Jeff Davidson's avatar Jeff Davidson Committed by Android Git Automerger
Browse files

am 0efd29fc: am 386effc7: am f779e6b8: Merge "Fix flipped captive portal bit... 

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

* commit '0efd29fc':
  Fix flipped captive portal bit in network conditions bcast.
parents 5d0bf5de 0efd29fc

services/core/java/com/android/server/connectivity/NetworkMonitor.java

+2 −1
Original line number Diff line number Diff line
@@ -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);