1f64f3fd14caca5ace9bfdbb036e3711d5484de3 - frameworks_base

commit	1f64f3fd14caca5ace9bfdbb036e3711d5484de3	[log] [tgz]
author	Calvin On <con@google.com>	Tue Oct 11 15:10:46 2016 -0700
committer	Lorenzo Colitti <lorenzo@google.com>	Thu Dec 08 17:13:33 2016 +0900
tree	3f1daf22824af102aed2b06b1993fdb080e4d09e
parent	dafc44ea11972b3152e67dc305a98d658f1465ba [diff]

DO NOT MERGE: 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: 3f1daf22824af102aed2b06b1993fdb080e4d09e