From fe1ce1e047a170d26b2b10bc8f7a2a5878793823 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Tue, 7 Jan 2020 11:44:14 +0900 Subject: 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 --- api/system-current.txt | 1 + api/test-current.txt | 1 + core/java/android/app/SystemServiceRegistry.java | 8 ++++++++ core/java/android/content/Context.java | 4 +++- 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/api/system-current.txt b/api/system-current.txt index 7d9cf5f31b9d..0bc0c9033281 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1573,6 +1573,7 @@ package android.content { field public static final String NETD_SERVICE = "netd"; 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_STACK_SERVICE = "network_stack"; field public static final String OEM_LOCK_SERVICE = "oem_lock"; field public static final String PERMISSION_SERVICE = "permission"; field public static final String PERSISTENT_DATA_BLOCK_SERVICE = "persistent_data_block"; diff --git a/api/test-current.txt b/api/test-current.txt index 9b702bb6a7ef..176ecc935e67 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -651,6 +651,7 @@ package android.content { method public void setContentCaptureOptions(@Nullable android.content.ContentCaptureOptions); field public static final String BUGREPORT_SERVICE = "bugreport"; 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 ROLLBACK_SERVICE = "rollback"; field public static final String STATUS_BAR_SERVICE = "statusbar"; diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java index 82df702eb7e5..88976e182e6d 100644 --- a/core/java/android/app/SystemServiceRegistry.java +++ b/core/java/android/app/SystemServiceRegistry.java @@ -341,6 +341,14 @@ final class SystemServiceRegistry { } }); + registerService(Context.NETWORK_STACK_SERVICE, IBinder.class, + new StaticServiceFetcher() { + @Override + public IBinder createService() { + return ServiceManager.getService(Context.NETWORK_STACK_SERVICE); + } + }); + registerService(Context.TETHERING_SERVICE, TetheringManager.class, new CachedServiceFetcher() { @Override diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 0228b10b66c7..f2f905126715 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -3851,10 +3851,12 @@ public abstract class Context { /** * 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 * @see NetworkStackClient */ + @SystemApi + @TestApi public static final String NETWORK_STACK_SERVICE = "network_stack"; /** -- cgit v1.2.3-59-g8ed1b