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

Merge "Expose NetworkWatchlistManager#getWatchlistConfigHash" am: 7d72edb937 am: 0727d8d08c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09ae1ef7ad7e45b0870c09f8e20875ffe3714f6c
This commit is contained in:
Paul Hu
2021-02-23 22:30:01 +00:00
committed by Automerger Merge Worker
parent f4d45a9d21 0727d8d08c
commit 2e26868923
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/module-lib-current.txt
View File

@@ -36,6 +36,10 @@ package android.net {
field public static final int TRANSPORT_TEST = 7; // 0x7 field public static final int TRANSPORT_TEST = 7; // 0x7
} }
public class NetworkWatchlistManager {
method @Nullable public byte[] getWatchlistConfigHash();
}
public final class Proxy { public final class Proxy {
method public static void setHttpProxyConfiguration(@Nullable android.net.ProxyInfo); method public static void setHttpProxyConfiguration(@Nullable android.net.ProxyInfo);
} }

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

@@ -16,6 +16,8 @@
package android.net; package android.net;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.annotation.SystemService; import android.annotation.SystemService;
import android.content.Context; import android.content.Context;
import android.os.RemoteException; import android.os.RemoteException;
@@ -29,6 +31,7 @@ import com.android.internal.util.Preconditions;
* Class that manage network watchlist in system. * Class that manage network watchlist in system.
* @hide * @hide
*/ */
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
@SystemService(Context.NETWORK_WATCHLIST_SERVICE) @SystemService(Context.NETWORK_WATCHLIST_SERVICE)
public class NetworkWatchlistManager { public class NetworkWatchlistManager {
@@ -90,6 +93,7 @@ public class NetworkWatchlistManager {
/** /**
* Get Network Watchlist config file hash. * Get Network Watchlist config file hash.
*/ */
@Nullable
public byte[] getWatchlistConfigHash() { public byte[] getWatchlistConfigHash() {
try { try {
return mNetworkWatchlistManager.getWatchlistConfigHash(); return mNetworkWatchlistManager.getWatchlistConfigHash();