Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddbd3243 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I2492c9b4e7bb5b34ad6b3719525e8b00433d2778
parents c27980c1 5ee7a7d0

src/com/android/settings/network/PrivateDnsModeDialogPreference.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

src/com/android/settings/network/PrivateDnsPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -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);