Merge "Expose NetworkWatchlistManager#getWatchlistConfigHash"

    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);

  }

package android.net;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.annotation.SystemService;

import android.content.Context;

import android.os.RemoteException;

 * Class that manage network watchlist in system.

 * @hide

 */

@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

@SystemService(Context.NETWORK_WATCHLIST_SERVICE)

public class NetworkWatchlistManager {

    /**

     * Get Network Watchlist config file hash.

     */

    @Nullable

    public byte[] getWatchlistConfigHash() {

        try {

            return mNetworkWatchlistManager.getWatchlistConfigHash();