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

Commit 863c4e32 authored by Ricky Wai's avatar Ricky Wai Committed by android-build-merger
Browse files

Merge "Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc"... 

Merge "Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc" into pi-dev am: e1c76d71
am: b76efd7a

Change-Id: I3175d06a5ab7fdb14f1a65175af0f8b8a3d37959
parents ef90fa04 b76efd7a

core/java/android/net/ConnectivityManager.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -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.

     */

     */