diff options
3 files changed, 3 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 35f119428dc7..cdc06aec0744 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -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(); } diff --git a/services/core/java/com/android/server/connectivity/DnsManager.java b/services/core/java/com/android/server/connectivity/DnsManager.java index 271ec4eac9e8..c7891865644a 100644 --- a/services/core/java/com/android/server/connectivity/DnsManager.java +++ b/services/core/java/com/android/server/connectivity/DnsManager.java @@ -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<>(); diff --git a/tests/net/java/com/android/server/connectivity/DnsManagerTest.java b/tests/net/java/com/android/server/connectivity/DnsManagerTest.java index 32bfa7059b0b..f5b85ca06f92 100644 --- a/tests/net/java/com/android/server/connectivity/DnsManagerTest.java +++ b/tests/net/java/com/android/server/connectivity/DnsManagerTest.java @@ -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, ""); |