summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ricky Wai <rickywai@google.com> 2018-03-26 16:46:20 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-03-26 16:46:20 +0000
commite1c76d71e747d9bb1e5ecdb2ffc5fe254cba174b (patch)
treefef11cd076a9fa2561b183e46d25606720699645
parent54fd127590d8effd8ce6f73ec5a7672da84c308a (diff)
parenta86d5d5624d691b4b1906eae25a67ee19a600c80 (diff)
Merge "Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc" into pi-dev
-rw-r--r--core/java/android/net/ConnectivityManager.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 93b1b22690ad..e07f586a5701 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -3851,8 +3851,8 @@ public class ConnectivityManager {
/**
* 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
- * used by the system.
+ * potentially harmful apps. This method returns the SHA-256 of the watchlist config file
+ * currently used by the system for validation purposes.
*
* @return Hash of network watchlist config file. Null if config does not exist.
*/