diff options
| -rw-r--r-- | core/res/res/values/config.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 2 | ||||
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 15 |
3 files changed, 13 insertions, 7 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 53b47622e8ae..e5ee9f2809cc 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -7280,4 +7280,7 @@ features. Examples include the search functionality or the app predictor. --> <string name="config_systemVendorIntelligence" translatable="false"></string> + + <!-- Whether the device supports Wi-Fi USD feature. --> + <bool name="config_deviceSupportsWifiUsd">false</bool> </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 28de553f6063..82f1e23c0dac 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -5884,5 +5884,7 @@ <java-symbol type="dimen" name="config_shapeCornerRadiusLarge"/> <java-symbol type="dimen" name="config_shapeCornerRadiusXlarge"/> + <!-- Whether the device supports Wi-Fi USD feature. --> + <java-symbol type="bool" name="config_deviceSupportsWifiUsd" /> </resources> diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 65315af45486..33c71e1786bd 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -2150,13 +2150,14 @@ public final class SystemServer implements Dumpable { mSystemServiceManager.startServiceFromJar( WIFI_SCANNING_SERVICE_CLASS, WIFI_APEX_SERVICE_JAR_PATH); t.traceEnd(); - // Start USD service - if (android.net.wifi.flags.Flags.usd()) { - t.traceBegin("StartUsd"); - mSystemServiceManager.startServiceFromJar( - WIFI_USD_SERVICE_CLASS, WIFI_APEX_SERVICE_JAR_PATH); - t.traceEnd(); - } + } + + if (android.net.wifi.flags.Flags.usd() && context.getResources().getBoolean( + com.android.internal.R.bool.config_deviceSupportsWifiUsd)) { + t.traceBegin("StartWifiUsd"); + mSystemServiceManager.startServiceFromJar(WIFI_USD_SERVICE_CLASS, + WIFI_APEX_SERVICE_JAR_PATH); + t.traceEnd(); } if (context.getPackageManager().hasSystemFeature( |