joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Remove unused MockableSystemProperties from DnsManager constructor" am: 3e23d7271b am: 250a9d3d20

Browse source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466231

Change-Id: Ib8464068df47baebd3d56c66f6b517d8f59da4f9
This commit is contained in:
Chiachang Wang 2020-10-20 19:44:46 +00:00 • committed by Automerger Merge Worker
commit 672ee3eef5
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, "");