diff options
| author | Paul Hu <paulhu@google.com> | 2021-02-23 22:21:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-23 22:21:44 +0000 |
| commit | 0727d8d08c45de02e118d799efa878950e843ca7 (patch) | |
| tree | 7778b8c8dada2c73789d8de0ee94619fec7363d6 /core/java/android | |
| parent | bdc150f744534d09ed0393e8375fc80fc8fd6a96 (diff) | |
| parent | 7d72edb9379f0ecb19422c2c88f66aad14394cfc (diff) | |
Merge "Expose NetworkWatchlistManager#getWatchlistConfigHash" am: 7d72edb937
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569981
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9bb97f5e7daffed6374b93926a908a8c2175bbcd
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/NetworkWatchlistManager.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/net/NetworkWatchlistManager.java b/core/java/android/net/NetworkWatchlistManager.java index 49047d3a0c87..8f6510ed3ea5 100644 --- a/core/java/android/net/NetworkWatchlistManager.java +++ b/core/java/android/net/NetworkWatchlistManager.java @@ -16,6 +16,8 @@ package android.net; +import android.annotation.Nullable; +import android.annotation.SystemApi; import android.annotation.SystemService; import android.content.Context; import android.os.RemoteException; @@ -29,6 +31,7 @@ import com.android.internal.util.Preconditions; * Class that manage network watchlist in system. * @hide */ +@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) @SystemService(Context.NETWORK_WATCHLIST_SERVICE) public class NetworkWatchlistManager { @@ -90,6 +93,7 @@ public class NetworkWatchlistManager { /** * Get Network Watchlist config file hash. */ + @Nullable public byte[] getWatchlistConfigHash() { try { return mNetworkWatchlistManager.getWatchlistConfigHash(); |