4d092238de2de290f018c41c1134b8b89baa635d - LeafOS-Project/android_frameworks_base

commit	4d092238de2de290f018c41c1134b8b89baa635d	[log] [tgz]
author	Erik Kline <ek@google.com>	Mon Oct 30 15:29:44 2017 +0900
committer	Erik Kline <ek@google.com>	Tue Nov 07 12:47:36 2017 +0900
tree	3c6840559dd71cb3d4a08a13edd8cc338e9a673e
parent	e158cdaaa5996bcf1294d1d368d0b00e19561e64 [diff]

Replace dns_tls with private_dns_mode setting

Also includes:
    - SettingsLib strings used in PrivateDnsModeDialogPreference
      interaction in the Settings app
    - rename ContentResolver "resolver" in methods working with
      DNS resolvers (too confusing)

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net
    - no new failures in SettingsBackupTest nor in SettingsProviderTest
    - manual interaction with developer option works
Bug: 34953048
Bug: 64133961
Change-Id: Ia7502916db9ffa0792e1e500a35e34d06a88e79d

core/java/android/net/ConnectivityManager.java[diff]
core/java/android/provider/Settings.java[diff]
core/tests/coretests/src/android/provider/SettingsBackupTest.java[diff]
packages/SettingsLib/res/values/strings.xml[diff]
services/core/java/com/android/server/NetworkManagementService.java[diff]

5 files changed

tree: 3c6840559dd71cb3d4a08a13edd8cc338e9a673e