PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change the parameter type from ContentResolver to Context" am: 5ee7a7d07d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639939

Change-Id: I2492c9b4e7bb5b34ad6b3719525e8b00433d2778
This commit is contained in:
Lucas Lin
2021-03-17 07:02:17 +00:00
committed by Automerger Merge Worker
parent c27980c1a9 5ee7a7d07d
commit ddbd32432e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/PrivateDnsModeDialogPreference.java
View File

@@ -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);

2
src/com/android/settings/network/PrivateDnsPreferenceController.java
View File

@@ -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<InetAddress> dnses = (lp == null) ? null : lp.getValidatedPrivateDnsServers();
final boolean dnsesResolved = !ArrayUtils.isEmpty(dnses);