Merge "Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc" into pi-dev

am: 2ce1e6ce2a

Change-Id: Ic3de4d136a995a8291fb43c780a311e423aeb9b7
This commit is contained in:
Ricky Wai
2018-03-26 17:01:45 +00:00
committed by android-build-merger

View File

@@ -3851,8 +3851,8 @@ public class ConnectivityManager {
/** /**
* The network watchlist is a list of domains and IP addresses that are associated with * The network watchlist is a list of domains and IP addresses that are associated with
* potentially harmful apps. This method returns the hash of the watchlist currently * potentially harmful apps. This method returns the SHA-256 of the watchlist config file
* used by the system. * currently used by the system for validation purposes.
* *
* @return Hash of network watchlist config file. Null if config does not exist. * @return Hash of network watchlist config file. Null if config does not exist.
*/ */