LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused MockableSystemProperties from DnsManager constructor

Browse Source 
DnsManager does not use MockableSystemProperties to communicate
with netd to configure the dns server anymore. ConnectivityService
does not need to take it into DnsManager as a parameter. Thus,
clean up the unused code.

Bug: 33308258
Test: atest FrameworksNetTests
Change-Id: I2ac89944391f7d1fd5d67f26cf7f2b11a4a4cf84
This commit is contained in:
Chiachang Wang
2020-10-20 15:38:58 +08:00
parent a2d7ef0a8a
commit c1215d3d46
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -1169,7 +1169,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
mMultipathPolicyTracker = new MultipathPolicyTracker(mContext, mHandler); mMultipathPolicyTracker = new MultipathPolicyTracker(mContext, mHandler);
mDnsManager = new DnsManager(mContext, mDnsResolver, mSystemProperties); mDnsManager = new DnsManager(mContext, mDnsResolver);
registerPrivateDnsSettingsCallbacks(); registerPrivateDnsSettingsCallbacks();
} }

4
services/core/java/com/android/server/connectivity/DnsManager.java
View File

@@ -237,7 +237,6 @@ public class DnsManager {
private final Context mContext; private final Context mContext;
private final ContentResolver mContentResolver; private final ContentResolver mContentResolver;
private final IDnsResolver mDnsResolver; private final IDnsResolver mDnsResolver;
private final MockableSystemProperties mSystemProperties;
private final ConcurrentHashMap<Integer, PrivateDnsConfig> mPrivateDnsMap; private final ConcurrentHashMap<Integer, PrivateDnsConfig> mPrivateDnsMap;
// TODO: Replace the Map with SparseArrays. // TODO: Replace the Map with SparseArrays.
private final Map<Integer, PrivateDnsValidationStatuses> mPrivateDnsValidationMap; private final Map<Integer, PrivateDnsValidationStatuses> mPrivateDnsValidationMap;
@@ -249,11 +248,10 @@ public class DnsManager {
private int mMinSamples; private int mMinSamples;
private int mMaxSamples; private int mMaxSamples;
public DnsManager(Context ctx, IDnsResolver dnsResolver, MockableSystemProperties sp) { public DnsManager(Context ctx, IDnsResolver dnsResolver) {
mContext = ctx; mContext = ctx;
mContentResolver = mContext.getContentResolver(); mContentResolver = mContext.getContentResolver();
mDnsResolver = dnsResolver; mDnsResolver = dnsResolver;
mSystemProperties = sp;
mPrivateDnsMap = new ConcurrentHashMap<>(); mPrivateDnsMap = new ConcurrentHashMap<>();
mPrivateDnsValidationMap = new HashMap<>(); mPrivateDnsValidationMap = new HashMap<>();
mLinkPropertiesMap = new HashMap<>(); mLinkPropertiesMap = new HashMap<>();

3
tests/net/java/com/android/server/connectivity/DnsManagerTest.java
View File

@@ -98,7 +98,6 @@ public class DnsManagerTest {
@Mock Context mCtx; @Mock Context mCtx;
@Mock IDnsResolver mMockDnsResolver; @Mock IDnsResolver mMockDnsResolver;
@Mock MockableSystemProperties mSystemProperties;
private void assertResolverOptionsEquals( private void assertResolverOptionsEquals(
@NonNull ResolverOptionsParcel actual, @NonNull ResolverOptionsParcel actual,
@@ -137,7 +136,7 @@ public class DnsManagerTest {
mContentResolver.addProvider(Settings.AUTHORITY, mContentResolver.addProvider(Settings.AUTHORITY,
new FakeSettingsProvider()); new FakeSettingsProvider());
when(mCtx.getContentResolver()).thenReturn(mContentResolver); when(mCtx.getContentResolver()).thenReturn(mContentResolver);
mDnsManager = new DnsManager(mCtx, mMockDnsResolver, mSystemProperties); mDnsManager = new DnsManager(mCtx, mMockDnsResolver);
// Clear the private DNS settings // Clear the private DNS settings
Settings.Global.putString(mContentResolver, PRIVATE_DNS_DEFAULT_MODE, ""); Settings.Global.putString(mContentResolver, PRIVATE_DNS_DEFAULT_MODE, "");