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

Merge "Rename to isTetheringFeatureEnabled" into main

Browse Source
This commit is contained in:
Motomu Utsumi
2023-08-21 03:17:38 +00:00
committed by Gerrit Code Review
parent 359dacfd26 624aeb4274
commit cad1226991
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Tethering/src/com/android/networkstack/tethering/TetheringConfiguration.java
View File

@@ -112,8 +112,8 @@ public class TetheringConfiguration {
* config_tether_upstream_automatic when set to true. * config_tether_upstream_automatic when set to true.
* *
* This flag is enabled if !=0 and less than the module APEX version: see * This flag is enabled if !=0 and less than the module APEX version: see
* {@link DeviceConfigUtils#isFeatureEnabled}. It is also ignored after R, as later devices * {@link DeviceConfigUtils#isTetheringFeatureEnabled}. It is also ignored after R, as later
* should just set config_tether_upstream_automatic to true instead. * devices should just set config_tether_upstream_automatic to true instead.
*/ */
public static final String TETHER_FORCE_UPSTREAM_AUTOMATIC_VERSION = public static final String TETHER_FORCE_UPSTREAM_AUTOMATIC_VERSION =
"tether_force_upstream_automatic_version"; "tether_force_upstream_automatic_version";
@@ -181,7 +181,7 @@ public class TetheringConfiguration {
public static class Dependencies { public static class Dependencies {
boolean isFeatureEnabled(@NonNull Context context, @NonNull String namespace, boolean isFeatureEnabled(@NonNull Context context, @NonNull String namespace,
@NonNull String name, @NonNull String moduleName, boolean defaultEnabled) { @NonNull String name, @NonNull String moduleName, boolean defaultEnabled) {
return DeviceConfigUtils.isFeatureEnabled(context, namespace, name, return DeviceConfigUtils.isTetheringFeatureEnabled(context, namespace, name,
moduleName, defaultEnabled); moduleName, defaultEnabled);
} }

18
service-t/src/com/android/server/NsdService.java
View File

@@ -144,7 +144,7 @@ public class NsdService extends INsdManager.Stub {
* "mdns_advertiser_allowlist_othertype_version" * "mdns_advertiser_allowlist_othertype_version"
* would be used to toggle MdnsDiscoveryManager / MdnsAdvertiser for each type. The flags will * would be used to toggle MdnsDiscoveryManager / MdnsAdvertiser for each type. The flags will
* be read with * be read with
* {@link DeviceConfigUtils#isFeatureEnabled(Context, String, String, String, boolean)}. * {@link DeviceConfigUtils#isTetheringFeatureEnabled}
* *
* @see #MDNS_DISCOVERY_MANAGER_ALLOWLIST_FLAG_PREFIX * @see #MDNS_DISCOVERY_MANAGER_ALLOWLIST_FLAG_PREFIX
* @see #MDNS_ADVERTISER_ALLOWLIST_FLAG_PREFIX * @see #MDNS_ADVERTISER_ALLOWLIST_FLAG_PREFIX
@@ -1657,9 +1657,9 @@ public class NsdService extends INsdManager.Stub {
* @return true if the MdnsDiscoveryManager feature is enabled. * @return true if the MdnsDiscoveryManager feature is enabled.
*/ */
public boolean isMdnsDiscoveryManagerEnabled(Context context) { public boolean isMdnsDiscoveryManagerEnabled(Context context) {
return isAtLeastU() || DeviceConfigUtils.isFeatureEnabled(context, NAMESPACE_TETHERING, return isAtLeastU() || DeviceConfigUtils.isTetheringFeatureEnabled(context,
MDNS_DISCOVERY_MANAGER_VERSION, DeviceConfigUtils.TETHERING_MODULE_NAME, NAMESPACE_TETHERING, MDNS_DISCOVERY_MANAGER_VERSION,
false /* defaultEnabled */); DeviceConfigUtils.TETHERING_MODULE_NAME, false /* defaultEnabled */);
} }
/** /**
@@ -1669,9 +1669,9 @@ public class NsdService extends INsdManager.Stub {
* @return true if the MdnsAdvertiser feature is enabled. * @return true if the MdnsAdvertiser feature is enabled.
*/ */
public boolean isMdnsAdvertiserEnabled(Context context) { public boolean isMdnsAdvertiserEnabled(Context context) {
return isAtLeastU() || DeviceConfigUtils.isFeatureEnabled(context, NAMESPACE_TETHERING, return isAtLeastU() || DeviceConfigUtils.isTetheringFeatureEnabled(context,
MDNS_ADVERTISER_VERSION, DeviceConfigUtils.TETHERING_MODULE_NAME, NAMESPACE_TETHERING, MDNS_ADVERTISER_VERSION,
false /* defaultEnabled */); DeviceConfigUtils.TETHERING_MODULE_NAME, false /* defaultEnabled */);
} }
/** /**
@@ -1685,10 +1685,10 @@ public class NsdService extends INsdManager.Stub {
} }
/** /**
* @see DeviceConfigUtils#isFeatureEnabled(Context, String, String, String, boolean) * @see DeviceConfigUtils#isTetheringFeatureEnabled
*/ */
public boolean isFeatureEnabled(Context context, String feature) { public boolean isFeatureEnabled(Context context, String feature) {
return DeviceConfigUtils.isFeatureEnabled(context, NAMESPACE_TETHERING, return DeviceConfigUtils.isTetheringFeatureEnabled(context, NAMESPACE_TETHERING,
feature, DeviceConfigUtils.TETHERING_MODULE_NAME, false /* defaultEnabled */); feature, DeviceConfigUtils.TETHERING_MODULE_NAME, false /* defaultEnabled */);
} }

4
service/src/com/android/server/ConnectivityService.java
View File

@@ -1413,10 +1413,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
/** /**
* @see DeviceConfigUtils#isFeatureEnabled * @see DeviceConfigUtils#isTetheringFeatureEnabled
*/ */
public boolean isFeatureEnabled(Context context, String name) { public boolean isFeatureEnabled(Context context, String name) {
return DeviceConfigUtils.isFeatureEnabled(context, NAMESPACE_TETHERING, name, return DeviceConfigUtils.isTetheringFeatureEnabled(context, NAMESPACE_TETHERING, name,
TETHERING_MODULE_NAME, false /* defaultValue */); TETHERING_MODULE_NAME, false /* defaultValue */);
} }