Merge "Add TEST_NETWORK_SERVICE to module API" am: 7e26e33269 am: 6d208315f8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629260

Change-Id: I3cd53e2c9f9ed61153b083661ff0402cf1eb607b
This commit is contained in:
Remi NGUYEN VAN
2021-03-19 03:44:03 +00:00
committed by Automerger Merge Worker
2 changed files with 6 additions and 1 deletions

View File

@@ -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";
}

View File

@@ -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