4bc78eba6f16ef84206aaed9edd5ca4bb4f6c420 - platform/frameworks/base

commit	4bc78eba6f16ef84206aaed9edd5ca4bb4f6c420	[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 18:50:46 2016 +0000
tree	2a1ae2669fed187d07cf55a7dcd00af5f472f39f
parent	f9ca194dbe2743d87ef36c6f66e12720011c9860 [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
(cherry picked from commit be96da11ccb5dd500f920c3ba90d350857293b3d)

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: 2a1ae2669fed187d07cf55a7dcd00af5f472f39f