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

Commit fc9119df authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Add a test API for testing NetworkStack.getService 

NetworkStack.getService was introduced to avoid relying on
Context#getSystemService to obtain the NetworkStack binder token.
To allow it to be mocked in tests, a method is introduced to allow tests
to specify a mock NetworkStack token for their own process.

Test: atest NetworkStackTests, using the change
Bug: 151243982
Change-Id: I04058a007f2dfe1044cabeb3ac508404873665ad
parent 438018d1

api/test-current.txt

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


  public class NetworkStack {

    method @Nullable public static android.os.IBinder getService();

    method public static void setServiceForTest(@Nullable android.os.IBinder);

    field public static final String PERMISSION_MAINLINE_NETWORK_STACK = "android.permission.MAINLINE_NETWORK_STACK";

  }

core/java/android/net/NetworkStack.java

+17 −0
Original line number Diff line number Diff line
@@ -45,6 +45,9 @@ public class NetworkStack { 
    public static final String PERMISSION_MAINLINE_NETWORK_STACK =

            "android.permission.MAINLINE_NETWORK_STACK";



    @Nullable

    private static volatile IBinder sMockService;



    /**

     * Get an {@link IBinder} representing the NetworkStack stable AIDL Interface, if registered.

     * @hide
@@ -53,9 +56,23 @@ public class NetworkStack { 
    @SystemApi

    @TestApi

    public static IBinder getService() {

        final IBinder mockService = sMockService;

        if (mockService != null) return mockService;

        return ServiceManager.getService(Context.NETWORK_STACK_SERVICE);

    }



    /**

     * Set a mock service for testing, to be returned by future calls to {@link #getService()}.

     *

     * <p>Passing a {@code null} {@code mockService} resets {@link #getService()} to normal

     * behavior.

     * @hide

     */

    @TestApi

    public static void setServiceForTest(@Nullable IBinder mockService) {

        sMockService = mockService;

    }



    private NetworkStack() {}



    /**