From 2bf4c58ceb753b1b0d13a84cd9d4265b5e41798a Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Thu, 11 Mar 2021 21:06:10 +0900 Subject: Add TEST_NETWORK_SERVICE to module API TestNetworkManager is being unbundled; the TEST_NETWORK_SERVICE constant is necessary for the module to register the manager with registerContextAwareService. Bug: 171540887 Test: m Change-Id: I0690251ddfcdaa8a34830e110b75869a370de389 Merged-In: I0690251ddfcdaa8a34830e110b75869a370de389 --- core/api/module-lib-current.txt | 4 ++++ core/java/android/content/Context.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'core') diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index 992b57f356c5..bc91c5a14e74 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -22,6 +22,10 @@ package android.app.usage { package android.content { + public abstract class Context { + field public static final String TEST_NETWORK_SERVICE = "test_network"; + } + public class Intent implements java.lang.Cloneable android.os.Parcelable { field public static final String ACTION_CLEAR_DNS_CACHE = "android.intent.action.CLEAR_DNS_CACHE"; } diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index aa6127904400..fe9ed27a516f 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -4099,7 +4099,8 @@ public abstract class Context { * @see #getSystemService(String) * @hide */ - @TestApi public static final String TEST_NETWORK_SERVICE = "test_network"; + @TestApi @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) + public static final String TEST_NETWORK_SERVICE = "test_network"; /** * Use with {@link #getSystemService(String)} to retrieve a {@link -- cgit v1.2.3