Remove unnecessary arguments from isTetheringFeatureEnabled

This CL also updates not to use isTetheringFeatureEnabled for
TETHER_FORCE_UPSTREAM_AUTOMATIC_VERSION which is wrongly configured in
Connectivity namespace.

Test: m
Bug: 279108992
Change-Id: If4f3a57c749bbaeb85454c31248c5bc5feaab936
This commit is contained in:
Motomu Utsumi
2023-08-15 16:32:44 +09:00
parent fcd2b7ccb0
commit 3e0be398a2
5 changed files with 39 additions and 43 deletions

View File

@@ -1713,8 +1713,7 @@ public class NsdService extends INsdManager.Stub {
*/
public boolean isMdnsDiscoveryManagerEnabled(Context context) {
return isAtLeastU() || DeviceConfigUtils.isTetheringFeatureEnabled(context,
NAMESPACE_TETHERING, MDNS_DISCOVERY_MANAGER_VERSION,
DeviceConfigUtils.TETHERING_MODULE_NAME, false /* defaultEnabled */);
MDNS_DISCOVERY_MANAGER_VERSION);
}
/**
@@ -1725,8 +1724,7 @@ public class NsdService extends INsdManager.Stub {
*/
public boolean isMdnsAdvertiserEnabled(Context context) {
return isAtLeastU() || DeviceConfigUtils.isTetheringFeatureEnabled(context,
NAMESPACE_TETHERING, MDNS_ADVERTISER_VERSION,
DeviceConfigUtils.TETHERING_MODULE_NAME, false /* defaultEnabled */);
MDNS_ADVERTISER_VERSION);
}
/**
@@ -1743,8 +1741,7 @@ public class NsdService extends INsdManager.Stub {
* @see DeviceConfigUtils#isTetheringFeatureEnabled
*/
public boolean isFeatureEnabled(Context context, String feature) {
return DeviceConfigUtils.isTetheringFeatureEnabled(context, NAMESPACE_TETHERING,
feature, DeviceConfigUtils.TETHERING_MODULE_NAME, false /* defaultEnabled */);
return DeviceConfigUtils.isTetheringFeatureEnabled(context, feature);
}
/**