diff options
| author | 2024-12-10 09:55:09 -0800 | |
|---|---|---|
| committer | 2024-12-10 09:57:47 -0800 | |
| commit | e9225d75a49c5a0241d026dc81e494f7cefbdf4a (patch) | |
| tree | 64fac4e889c11470b806de4b9a605095eb1dc024 | |
| parent | 52f31f182ad9d1a7dd3161898cb3a9da9a65e32c (diff) | |
Add build time overlay for Wifi USD feature support
Bug: 381863785
Bug: 340878198
Flag: android.net.wifi.flags.usd
Test: atest FrameworksWifiApiTests
Change-Id: I1e0956dcd4d5b9879d86cb9f49d7e4f08eaa0876
| -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( |