From 5db454c28d3ddf724be3f6a697267f7f58d94e2d Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Thu, 14 Feb 2019 18:04:20 +0900 Subject: Move NetworkStack to services.net NetworkStack is only used in services.net or clients of services.net. It cannot stay in framework.jar because it needs to depend on AIDL interfaces, which would conflict with app implementations if they were in framework.jar. Test: atest FrameworksNetTests NetworkStackTests Bug: 124033493 Change-Id: Ib1d08a3669983640119d008db7e2990fa798724f Merged-In: I501b125a388c1100c2182bde4670944c2f0d7a02 --- core/java/android/content/Context.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'core/java/android/content') diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 493aac6e5c40..b072740ccfdf 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -49,7 +49,6 @@ import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase.CursorFactory; import android.graphics.Bitmap; import android.graphics.drawable.Drawable; -import android.net.NetworkStack; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -3514,11 +3513,10 @@ public abstract class Context { public static final String NETD_SERVICE = "netd"; /** - * Use with {@link #getSystemService(String)} to retrieve a - * {@link NetworkStack} for communicating with the network stack + * Use with {@link android.os.ServiceManager.getService()} to retrieve a + * {@link NetworkStackClient} IBinder for communicating with the network stack * @hide - * @see #getSystemService(String) - * @see NetworkStack + * @see NetworkStackClient */ public static final String NETWORK_STACK_SERVICE = "network_stack"; -- cgit v1.2.3