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

Commit 16357084 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add TEST_NETWORK_SERVICE to module API" into sc-dev am: 043d7139 

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

Change-Id: Iefb3fda30470195d2ae9831e5ae6c60f089b3218
parents cbd67812 043d7139

core/api/module-lib-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ package android.content { 


  public abstract class Context {

    method @NonNull public android.os.UserHandle getUser();

    field public static final String TEST_NETWORK_SERVICE = "test_network";

  }



  public class Intent implements java.lang.Cloneable android.os.Parcelable {

core/java/android/content/Context.java

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