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

Commit 5ee7a7d0 authored by Lucas Lin's avatar Lucas Lin Committed by Gerrit Code Review
Browse files

Merge "Change the parameter type from ContentResolver to Context"

parents d248042a 11e738c3

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