Merge "Register USD service" into main (5d0f719c) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -3940,6 +3940,7 @@ package android.content {
		field public static final String WIFI_NL80211_SERVICE = "wifinl80211";
		field @Deprecated public static final String WIFI_RTT_SERVICE = "rttmanager";
		field public static final String WIFI_SCANNING_SERVICE = "wifiscanner";
		field @FlaggedApi("android.net.wifi.flags.usd") public static final String WIFI_USD_SERVICE = "wifi_usd";
		}

		public final class ContextParams {

+14 −0

Original line number	Diff line number	Diff line
		@@ -4250,6 +4250,7 @@ public abstract class Context {
		//@hide: WIFI_RTT_SERVICE,
		//@hide: ETHERNET_SERVICE,
		WIFI_RTT_RANGING_SERVICE,
		WIFI_USD_SERVICE,
		NSD_SERVICE,
		AUDIO_SERVICE,
		AUDIO_DEVICE_VOLUME_SERVICE,
		@@ -5096,6 +5097,19 @@ public abstract class Context {
		*/
		public static final String WIFI_RTT_RANGING_SERVICE = "wifirtt";


		/**
		* Use with {@link #getSystemService(String)} to retrieve a {@link
		* android.net.wifi.usd.UsdManager} for Unsynchronized Service Discovery (USD) operation.
		*
		* @see #getSystemService(String)
		* @see android.net.wifi.usd.UsdManager
		* @hide
		*/
		@FlaggedApi(android.net.wifi.flags.Flags.FLAG_USD)
		@SystemApi
		public static final String WIFI_USD_SERVICE = "wifi_usd";

		/**
		* Use with {@link #getSystemService(String)} to retrieve a {@link
		* android.net.lowpan.LowpanManager} for handling management of

+9 −0

Original line number	Diff line number	Diff line
		@@ -422,6 +422,8 @@ public final class SystemServer implements Dumpable {
		"com.android.server.wifi.aware.WifiAwareService";
		private static final String WIFI_P2P_SERVICE_CLASS =
		"com.android.server.wifi.p2p.WifiP2pService";
		private static final String WIFI_USD_SERVICE_CLASS =
		"com.android.server.wifi.usd.UsdService";
		private static final String CONNECTIVITY_SERVICE_APEX_PATH =
		"/apex/com.android.tethering/javalib/service-connectivity.jar";
		private static final String CONNECTIVITY_SERVICE_INITIALIZER_CLASS =
		@@ -2145,6 +2147,13 @@ 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 (context.getPackageManager().hasSystemFeature(