Merge "Fix javadoc for the NetworkRequest version of requestNetwork."

This commit is contained in:
Lorenzo Colitti
2015-11-26 08:16:51 +00:00
committed by Android (Google) Code Review

View File

@@ -2541,7 +2541,7 @@ public class ConnectivityManager {
* This function behaves identically to the non-timedout version, but if a suitable
* network is not found within the given time (in milliseconds) the
* {@link NetworkCallback#unavailable} callback is called. The request must
* still be released normally by calling {@link releaseNetworkRequest}.
* still be released normally by calling {@link unregisterNetworkCallback}.
*
* <p>This method requires the caller to hold either the
* {@link android.Manifest.permission#CHANGE_NETWORK_STATE} permission