Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add NWM#getWatchlistConfigHash to test api for testing" am: e87f10b9a6

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

Change-Id: Ic1085f8b330d6e0832f56877a915cbfc42f7aa47
This commit is contained in:
Paul Hu
2021-04-16 08:34:57 +00:00
committed by Automerger Merge Worker
parent 3aba6fdd68 e87f10b9a6
commit 4d4af2bd05
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/test-current.txt
View File

@@ -1009,6 +1009,10 @@ package android.net {
method public static void setServiceForTest(@Nullable android.os.IBinder); method public static void setServiceForTest(@Nullable android.os.IBinder);
} }
public class NetworkWatchlistManager {
method @Nullable public byte[] getWatchlistConfigHash();
}
public class TrafficStats { public class TrafficStats {
method public static long getLoopbackRxBytes(); method public static long getLoopbackRxBytes();
method public static long getLoopbackRxPackets(); method public static long getLoopbackRxPackets();

2
core/java/android/net/NetworkWatchlistManager.java
View File

@@ -19,6 +19,7 @@ package android.net;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.annotation.SystemService; import android.annotation.SystemService;
import android.annotation.TestApi;
import android.content.Context; import android.content.Context;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
@@ -31,6 +32,7 @@ import com.android.internal.util.Preconditions;
* Class that manage network watchlist in system. * Class that manage network watchlist in system.
* @hide * @hide
*/ */
@TestApi
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
@SystemService(Context.NETWORK_WATCHLIST_SERVICE) @SystemService(Context.NETWORK_WATCHLIST_SERVICE)
public class NetworkWatchlistManager { public class NetworkWatchlistManager {