Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0727d8d0 authored by Paul Hu's avatar Paul Hu Committed by Automerger Merge Worker
Browse files

Merge "Expose NetworkWatchlistManager#getWatchlistConfigHash" am: 7d72edb9 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9bb97f5e7daffed6374b93926a908a8c2175bbcd
parents bdc150f7 7d72edb9

core/api/module-lib-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -36,6 +36,10 @@ package android.net { 
    field public static final int TRANSPORT_TEST = 7; // 0x7

  }



  public class NetworkWatchlistManager {

    method @Nullable public byte[] getWatchlistConfigHash();

  }



  public final class Proxy {

    method public static void setHttpProxyConfiguration(@Nullable android.net.ProxyInfo);

  }

core/java/android/net/NetworkWatchlistManager.java

+4 −0
Original line number Diff line number Diff line
@@ -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();