commit 2ce1e6ce2afe6f04ee03748940f2ff135518f6a3
author Ricky Wai <rickywai@google.com> Mon Mar 26 16:46:20 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 26 16:46:20 2018 +0000
tree 1f9ccd06f9bdd91bacbc37d008d87dff0f08c7cb
parent e0c1ee641459ae026fa87f7f71ef1d0050952f26
parent 04baf117bfb3e44e0f9be44e5be0d7a73045b59b

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

core/java/android/net/ConnectivityManager.java

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 93b1b22..e07f586 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -3851,8 +3851,8 @@
 
     /**
      * 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.
      */