Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe1ce1e0 authored Jan 07, 2020 by Remi NGUYEN VAN Committed by Mark Chien Jan 14, 2020

Add NETWORK_STACK_SERVICE to SystemServiceRegistry

The service is already registered in ServiceManager. It needs to be
accessible from SystemServiceRegistry so that other mainline modules
can communicate with it.

Bug: 147255753
Test: Dependent CLs using the service
Change-Id: I940c62064466c3b3b8d2a195b810e90eaade7e6c
Merged-In: I940c62064466c3b3b8d2a195b810e90eaade7e6c

parent bd7c7549

api/system-current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1573,6 +1573,7 @@ package android.content {
	field public static final String NETD_SERVICE = "netd";		field public static final String NETD_SERVICE = "netd";
	field public static final String NETWORK_POLICY_SERVICE = "netpolicy";		field public static final String NETWORK_POLICY_SERVICE = "netpolicy";
	field public static final String NETWORK_SCORE_SERVICE = "network_score";		field public static final String NETWORK_SCORE_SERVICE = "network_score";
			field public static final String NETWORK_STACK_SERVICE = "network_stack";
	field public static final String OEM_LOCK_SERVICE = "oem_lock";		field public static final String OEM_LOCK_SERVICE = "oem_lock";
	field public static final String PERMISSION_SERVICE = "permission";		field public static final String PERMISSION_SERVICE = "permission";
	field public static final String PERSISTENT_DATA_BLOCK_SERVICE = "persistent_data_block";		field public static final String PERSISTENT_DATA_BLOCK_SERVICE = "persistent_data_block";

api/test-current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -651,6 +651,7 @@ package android.content {
	method public void setContentCaptureOptions(@Nullable android.content.ContentCaptureOptions);		method public void setContentCaptureOptions(@Nullable android.content.ContentCaptureOptions);
	field public static final String BUGREPORT_SERVICE = "bugreport";		field public static final String BUGREPORT_SERVICE = "bugreport";
	field public static final String CONTENT_CAPTURE_MANAGER_SERVICE = "content_capture";		field public static final String CONTENT_CAPTURE_MANAGER_SERVICE = "content_capture";
			field public static final String NETWORK_STACK_SERVICE = "network_stack";
	field public static final String PERMISSION_SERVICE = "permission";		field public static final String PERMISSION_SERVICE = "permission";
	field public static final String ROLLBACK_SERVICE = "rollback";		field public static final String ROLLBACK_SERVICE = "rollback";
	field public static final String STATUS_BAR_SERVICE = "statusbar";		field public static final String STATUS_BAR_SERVICE = "statusbar";

core/java/android/app/SystemServiceRegistry.java

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -341,6 +341,14 @@ final class SystemServiceRegistry {
	}		}
	});		});

			registerService(Context.NETWORK_STACK_SERVICE, IBinder.class,
			new StaticServiceFetcher<IBinder>() {
			@Override
			public IBinder createService() {
			return ServiceManager.getService(Context.NETWORK_STACK_SERVICE);
			}
			});

	registerService(Context.TETHERING_SERVICE, TetheringManager.class,		registerService(Context.TETHERING_SERVICE, TetheringManager.class,
	new CachedServiceFetcher<TetheringManager>() {		new CachedServiceFetcher<TetheringManager>() {
	@Override		@Override

core/java/android/content/Context.java

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3851,10 +3851,12 @@ public abstract class Context {

	/**		/**
	* Use with {@link android.os.ServiceManager.getService()} to retrieve a		* Use with {@link android.os.ServiceManager.getService()} to retrieve a
	* {@link NetworkStackClient} IBinder for communicating with the network stack		* {@link INetworkStackConnector} IBinder for communicating with the network stack
	* @hide		* @hide
	* @see NetworkStackClient		* @see NetworkStackClient
	*/		*/
			@SystemApi
			@TestApi
	public static final String NETWORK_STACK_SERVICE = "network_stack";		public static final String NETWORK_STACK_SERVICE = "network_stack";

	/**		/**