OSDN Git Service

Merge "Factor in PRIVATE_DNS_MODE_DEFAULTSETTING value" into pi-dev am: 5a0a7ef4bb
authorErik Kline <ek@google.com>
Wed, 23 May 2018 22:59:09 +0000 (15:59 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 23 May 2018 22:59:09 +0000 (15:59 -0700)
commite1a5ac804d381c3385a77d9e4d47d8b7d294dce7
tree744c658273997032bcea19b5605fc1962757b0e6
parent9ae99272cf53a8fee4392abc1f3b9c6ed5566066
parentcf83539e1e8c3b3b4012ff8b2ec5f782b923092c
Merge "Factor in PRIVATE_DNS_MODE_DEFAULTSETTING value" into pi-dev am: 5a0a7ef4bb
am: cf83539e1e

Change-Id: Ia06f5bef6d4103cf65a2c07d8dadecfa815080f7
src/com/android/settings/network/PrivateDnsModeDialogPreference.java
src/com/android/settings/network/PrivateDnsPreferenceController.java
tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java