From 11e738c3a02c621fa0fa3b845d65f1aa49974132 Mon Sep 17 00:00:00 2001 From: lucaslin Date: Tue, 16 Mar 2021 11:08:09 +0800 Subject: [PATCH] Change the parameter type from ContentResolver to Context Context is more useful than ContentResolver, it can provide more information if we want to change the behavior in the future. Bug: 172183305 Test: make RunSettingsRoboTests \ ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest Test: make RunSettingsRoboTests \ ROBOTEST_FILTER=PrivateDnsModeDialogPreferenceTest Change-Id: I6c06460b67f81112db311f0739457d5f1e2e4554 Merged-In: I6c06460b67f81112db311f0739457d5f1e2e4554 --- .../settings/network/PrivateDnsModeDialogPreference.java | 2 +- .../settings/network/PrivateDnsPreferenceController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java index ea29a1d796d..822aad05f49 100644 --- a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java +++ b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java @@ -160,7 +160,7 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat final Context context = getContext(); final ContentResolver contentResolver = context.getContentResolver(); - mMode = ConnectivityManager.getPrivateDnsMode(contentResolver); + mMode = ConnectivityManager.getPrivateDnsMode(context); mEditText = view.findViewById(R.id.private_dns_mode_provider_hostname); mEditText.addTextChangedListener(this); diff --git a/src/com/android/settings/network/PrivateDnsPreferenceController.java b/src/com/android/settings/network/PrivateDnsPreferenceController.java index 31360408bdd..4aa92f4e500 100644 --- a/src/com/android/settings/network/PrivateDnsPreferenceController.java +++ b/src/com/android/settings/network/PrivateDnsPreferenceController.java @@ -118,7 +118,7 @@ public class PrivateDnsPreferenceController extends BasePreferenceController public CharSequence getSummary() { final Resources res = mContext.getResources(); final ContentResolver cr = mContext.getContentResolver(); - final String mode = ConnectivityManager.getPrivateDnsMode(cr); + final String mode = ConnectivityManager.getPrivateDnsMode(mContext); final LinkProperties lp = mLatestLinkProperties; final List dnses = (lp == null) ? null : lp.getValidatedPrivateDnsServers(); final boolean dnsesResolved = !ArrayUtils.isEmpty(dnses);