be96da11ccb5dd500f920c3ba90d350857293b3d - platform/frameworks/base

commit	be96da11ccb5dd500f920c3ba90d350857293b3d	[log] [tgz]
author	Calvin On <con@google.com>	Tue Oct 11 15:10:46 2016 -0700
committer	Calvin On <con@google.com>	Thu Oct 20 00:51:39 2016 -0700
tree	4afec8b666e84bbd4c8363b147bc3dc286a1be40
parent	31be9d42afa0d99aacdbf53c55f849120c8c2167 [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
Change-Id: Ibe63942da04748ab0406e24e0f44be31d47710a0

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: 4afec8b666e84bbd4c8363b147bc3dc286a1be40