984b5b6000
This cleanup helps declutter ConnectivityService, and encapsulates the always-on setting inside of Vpn instead of spreading it across two classes. In particular having the save code in one file and the load code in another file was weird and I apologise for that. Added a SystemServices wrapper for Settings.Secure and PendingIntent calls to decouple some of the global state nastiness and make it testable without forcing ConnectivityService to drive the load/save. Test: runtest -x tests/net/java/com/android/server/ConnectivityServiceTest.java Test: runtest -x tests/net/java/com/android/server/connectivity/VpnTest.java Bug: 33159037 Change-Id: Ie2adb1c377adfcef0a5900dc866e6118f451b265