joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Mark connectivity test utilities as module API" am: 5ef8031d57

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5973e19d7b7a103235121f5efc1951985e3a4c41
This commit is contained in:
Remi NGUYEN VAN 2021-01-22 10:34:16 +00:00 • committed by Automerger Merge Worker
commit a9630d29d0
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/java/android/net/ConnectivityManager.java
View file

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

4
core/java/android/net/NetworkCapabilities.java
View file

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