diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-01-28 00:47:45 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-28 00:47:45 -0800 |
| commit | 50c95ba67ced35e9717ebe4af472949682137e36 (patch) | |
| tree | 9623f1337aad349b34bd9d3ef05ac8d4075a086f /core/java | |
| parent | f6a3b910bb303e1f4f8b497809158dcf623c198c (diff) | |
| parent | 9268c0be32998037b5ccaef037b45705160878f5 (diff) | |
Merge "Add INetd to SystemServiceRegistry" am: e3f18bd77c
am: 9268c0be32
Change-Id: I92cd23a587ab0f7df2db92918011a9a488c31668
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/SystemServiceRegistry.java | 9 | ||||
| -rw-r--r-- | core/java/android/content/Context.java | 10 |
2 files changed, 19 insertions, 0 deletions
diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java index d2f246846ce3..b2951df63ebd 100644 --- a/core/java/android/app/SystemServiceRegistry.java +++ b/core/java/android/app/SystemServiceRegistry.java @@ -84,6 +84,7 @@ import android.net.IConnectivityManager; import android.net.IEthernetManager; import android.net.IIpMemoryStore; import android.net.IIpSecService; +import android.net.INetd; import android.net.INetworkPolicyManager; import android.net.IpMemoryStore; import android.net.IpSecManager; @@ -288,6 +289,14 @@ final class SystemServiceRegistry { return new ConnectivityManager(context, service); }}); + registerService(Context.NETD_SERVICE, INetd.class, new StaticServiceFetcher<INetd>() { + @Override + public INetd createService() throws ServiceNotFoundException { + return INetd.Stub.asInterface( + ServiceManager.getServiceOrThrow(Context.NETD_SERVICE)); + } + }); + registerService(Context.NETWORK_STACK_SERVICE, NetworkStack.class, new StaticServiceFetcher<NetworkStack>() { @Override diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 721fc23847b1..276b40e3306b 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -3506,6 +3506,16 @@ public abstract class Context { /** * Use with {@link #getSystemService(String)} to retrieve a + * {@link android.net.INetd} for communicating with the network stack + * @hide + * @see #getSystemService(String) + * @hide + */ + @SystemApi + public static final String NETD_SERVICE = "netd"; + + /** + * Use with {@link #getSystemService(String)} to retrieve a * {@link NetworkStack} for communicating with the network stack * @hide * @see #getSystemService(String) |