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

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

Merge "Mark connectivity test utilities as module API" am: c74d6f31 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5973e19d7b7a103235121f5efc1951985e3a4c41
parents 27a214da c74d6f31

core/api/module-lib-current.txt

+8 −0
Original line number Diff line number Diff line
@@ -10,6 +10,14 @@ package android.app { 


package android.net {



  public class ConnectivityManager {

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_TEST_NETWORKS, android.Manifest.permission.NETWORK_STACK}) public void simulateDataStall(int, long, @NonNull android.net.Network, @NonNull android.os.PersistableBundle);

  }



  public final class NetworkCapabilities implements android.os.Parcelable {

    field public static final int TRANSPORT_TEST = 7; // 0x7

  }



  public final class TcpRepairWindow {

    ctor public TcpRepairWindow(int, int, int, int, int, int);

    field public final int maxWindow;

core/api/test-current.txt

+0 −9
Original line number Diff line number Diff line
@@ -980,10 +980,6 @@ package android.media.tv { 


package android.net {



  public class ConnectivityManager {

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_TEST_NETWORKS, android.Manifest.permission.NETWORK_STACK}) public void simulateDataStall(int, long, @NonNull android.net.Network, @NonNull android.os.PersistableBundle);

  }



  public class EthernetManager {

    method public void setIncludeTestInterfaces(boolean);

  }
@@ -992,11 +988,6 @@ package android.net { 
    field public static final int INVALID_SECURITY_PARAMETER_INDEX = 0; // 0x0

  }



  public final class NetworkCapabilities implements android.os.Parcelable {

    method public int[] getCapabilities();

    field public static final int TRANSPORT_TEST = 7; // 0x7

  }



  public class NetworkStack {

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

  }

core/java/android/net/ConnectivityManager.java

+3 −2
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import android.annotation.SdkConstant; 
import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.SystemApi;

import android.annotation.SystemService;

import android.annotation.TestApi;

import android.app.PendingIntent;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;
@@ -4823,6 +4822,8 @@ public class ConnectivityManager { 
    /**

     * Simulates a Data Stall for the specified Network.

     *

     * <p>This method should only be used for tests.

     *

     * <p>The caller must be the owner of the specified Network.

     *

     * @param detectionMethod The detection method used to identify the Data Stall.
@@ -4832,7 +4833,7 @@ public class ConnectivityManager { 
     * @throws SecurityException if the caller is not the owner of the given network.

     * @hide

     */

    @TestApi

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    @RequiresPermission(anyOf = {android.Manifest.permission.MANAGE_TEST_NETWORKS,

            android.Manifest.permission.NETWORK_STACK})

    public void simulateDataStall(int detectionMethod, long timestampMillis,

core/java/android/net/NetworkCapabilities.java

+1 −3
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.compat.annotation.UnsupportedAppUsage;

import android.net.ConnectivityManager.NetworkCallback;

import android.os.Build;
@@ -576,7 +575,6 @@ public final class NetworkCapabilities implements Parcelable { 
     * @hide

     */

    @UnsupportedAppUsage

    @TestApi

    public @NetCapability int[] getCapabilities() {

        return BitUtils.unpackBits(mNetworkCapabilities);

    }
@@ -821,7 +819,7 @@ public final class NetworkCapabilities implements Parcelable { 
     *

     * @hide

     */

    @TestApi

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    public static final int TRANSPORT_TEST = 7;



    /** @hide */