From e9225d75a49c5a0241d026dc81e494f7cefbdf4a Mon Sep 17 00:00:00 2001
From: maheshkkv <maheshkkv@google.com>
Date: Tue, 10 Dec 2024 09:55:09 -0800
Subject: 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
---
 services/java/com/android/server/SystemServer.java | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'services/java')

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(
-- 
cgit v1.2.3-59-g8ed1b