Merge "Add build time overlay for Wifi USD feature support" into main (12d762b6) · Commits · e / os / android_frameworks_base

core/res/res/values/config.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -7277,4 +7277,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>

+2 −0

Original line number	Diff line number	Diff line
		@@ -5801,5 +5801,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>

+8 −7

Original line number	Diff line number	Diff line
		@@ -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(