diff options
| author | 2024-12-16 09:36:47 -0800 | |
|---|---|---|
| committer | 2024-12-16 09:36:47 -0800 | |
| commit | 12d762b65b22df93396a0cf3763d783b16f507f3 (patch) | |
| tree | d124db29a8dcc67c9075982f0c5f588c748f9a05 /services/java | |
| parent | 1950aa07b6c5af25b97f35b97539442a40407fca (diff) | |
| parent | e9225d75a49c5a0241d026dc81e494f7cefbdf4a (diff) | |
Merge "Add build time overlay for Wifi USD feature support" into main
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 0eac4f2c922a..60130d1f97be 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -2167,13 +2167,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( |