d2bd69aec05a7030d14921a22d2792fdb7805bec - platform/frameworks/base

commit	d2bd69aec05a7030d14921a22d2792fdb7805bec	[log] [tgz]
author	Calvin On <con@google.com>	Tue Oct 11 15:10:46 2016 -0700
committer	Lorenzo Colitti <lorenzo@google.com>	Thu Jan 26 18:50:42 2017 +0900
tree	6458ecbc3541fdeb19df18fed13974f449768627
parent	02bab164b74b3d62e0bb4d975fefac2b3282e338 [diff]

Add option to skip and avoid captive portals.

Test: ConnectivityServiceTest updated with test cases.
Test: Manually tested against att-wifi in B42.
Bug: 30222699

(cherry picked from commit be96da11ccb5dd500f920c3ba90d350857293b3d)

Change-Id: I90c0f97fe0e41de4059bceae7b56ab3a70145696

core/java/android/provider/Settings.java[diff]
services/core/java/com/android/server/ConnectivityService.java[diff]
services/core/java/com/android/server/connectivity/NetworkMonitor.java[diff]
services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java[diff]

4 files changed

tree: 6458ecbc3541fdeb19df18fed13974f449768627