diff options
| author | 2021-04-16 08:34:57 +0000 | |
|---|---|---|
| committer | 2021-04-16 08:34:57 +0000 | |
| commit | 4d4af2bd05fcaec7a844767e4a40acdf09f67987 (patch) | |
| tree | e4f3283ef48a64b23cca3bbed56731e8995d5a5e | |
| parent | 3aba6fdd68d4426290c84ad8c0240259c25ee681 (diff) | |
| parent | e87f10b9a6a108ce2c5326b10133769135ab6c63 (diff) | |
Merge "Add NWM#getWatchlistConfigHash to test api for testing" am: e87f10b9a6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675628
Change-Id: Ic1085f8b330d6e0832f56877a915cbfc42f7aa47
| -rw-r--r-- | core/api/test-current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/net/NetworkWatchlistManager.java | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/core/api/test-current.txt b/core/api/test-current.txt index f7b101d56c27..fd6d47e56b52 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -1009,6 +1009,10 @@ package android.net { method public static void setServiceForTest(@Nullable android.os.IBinder); } + public class NetworkWatchlistManager { + method @Nullable public byte[] getWatchlistConfigHash(); + } + public class TrafficStats { method public static long getLoopbackRxBytes(); method public static long getLoopbackRxPackets(); diff --git a/core/java/android/net/NetworkWatchlistManager.java b/core/java/android/net/NetworkWatchlistManager.java index 8f6510ed3ea5..da01dcb83de4 100644 --- a/core/java/android/net/NetworkWatchlistManager.java +++ b/core/java/android/net/NetworkWatchlistManager.java @@ -19,6 +19,7 @@ package android.net; import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.SystemService; +import android.annotation.TestApi; import android.content.Context; import android.os.RemoteException; import android.os.ServiceManager; @@ -31,6 +32,7 @@ import com.android.internal.util.Preconditions; * Class that manage network watchlist in system. * @hide */ +@TestApi @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) @SystemService(Context.NETWORK_WATCHLIST_SERVICE) public class NetworkWatchlistManager { |