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

Commit 3e23d727 authored by Chiachang Wang's avatar Chiachang Wang Committed by Gerrit Code Review
Browse files

Merge "Remove unused MockableSystemProperties from DnsManager constructor"

parents 21819ef3 806eae49

services/core/java/com/android/server/ConnectivityService.java

+1 −1
Original line number Diff line number Diff line
@@ -1169,7 +1169,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 


        mMultipathPolicyTracker = new MultipathPolicyTracker(mContext, mHandler);



        mDnsManager = new DnsManager(mContext, mDnsResolver, mSystemProperties);

        mDnsManager = new DnsManager(mContext, mDnsResolver);

        registerPrivateDnsSettingsCallbacks();

    }

services/core/java/com/android/server/connectivity/DnsManager.java

+1 −3
Original line number Diff line number Diff line
@@ -237,7 +237,6 @@ public class DnsManager { 
    private final Context mContext;

    private final ContentResolver mContentResolver;

    private final IDnsResolver mDnsResolver;

    private final MockableSystemProperties mSystemProperties;

    private final ConcurrentHashMap<Integer, PrivateDnsConfig> mPrivateDnsMap;

    // TODO: Replace the Map with SparseArrays.

    private final Map<Integer, PrivateDnsValidationStatuses> mPrivateDnsValidationMap;
@@ -249,11 +248,10 @@ public class DnsManager { 
    private int mMinSamples;

    private int mMaxSamples;



    public DnsManager(Context ctx, IDnsResolver dnsResolver, MockableSystemProperties sp) {

    public DnsManager(Context ctx, IDnsResolver dnsResolver) {

        mContext = ctx;

        mContentResolver = mContext.getContentResolver();

        mDnsResolver = dnsResolver;

        mSystemProperties = sp;

        mPrivateDnsMap = new ConcurrentHashMap<>();

        mPrivateDnsValidationMap = new HashMap<>();

        mLinkPropertiesMap = new HashMap<>();

tests/net/java/com/android/server/connectivity/DnsManagerTest.java

+1 −2
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ public class DnsManagerTest { 


    @Mock Context mCtx;

    @Mock IDnsResolver mMockDnsResolver;

    @Mock MockableSystemProperties mSystemProperties;



    private void assertResolverOptionsEquals(

            @NonNull ResolverOptionsParcel actual,
@@ -137,7 +136,7 @@ public class DnsManagerTest { 
        mContentResolver.addProvider(Settings.AUTHORITY,

                new FakeSettingsProvider());

        when(mCtx.getContentResolver()).thenReturn(mContentResolver);

        mDnsManager = new DnsManager(mCtx, mMockDnsResolver, mSystemProperties);

        mDnsManager = new DnsManager(mCtx, mMockDnsResolver);



        // Clear the private DNS settings

        Settings.Global.putString(mContentResolver, PRIVATE_DNS_DEFAULT_MODE, "");