Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e876a21 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Add TEST_NETWORK_SERVICE to module API" am: 7e26e332 am: 6d208315 

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

Change-Id: I3cd53e2c9f9ed61153b083661ff0402cf1eb607b
parents 7f507fe7 6d208315

core/api/module-lib-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -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";

  }

core/java/android/content/Context.java

+2 −1
Original line number Diff line number Diff line
@@ -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