Merge "ConnectivityManager: unhide methods with Handler argument"

This commit is contained in:
Hugo Benichi
2017-03-13 06:58:29 +00:00
committed by Gerrit Code Review

View File

@@ -2956,7 +2956,6 @@ public class ConnectivityManager {
* @param handler {@link Handler} to specify the thread upon which the callback will be invoked. * @param handler {@link Handler} to specify the thread upon which the callback will be invoked.
* @throws IllegalArgumentException if {@code request} specifies any mutable * @throws IllegalArgumentException if {@code request} specifies any mutable
* {@code NetworkCapabilities}. * {@code NetworkCapabilities}.
* @hide
*/ */
public void requestNetwork( public void requestNetwork(
NetworkRequest request, NetworkCallback networkCallback, Handler handler) { NetworkRequest request, NetworkCallback networkCallback, Handler handler) {
@@ -3073,8 +3072,6 @@ public class ConnectivityManager {
* @param networkCallback The {@link NetworkCallback} to be utilized for this request. Note * @param networkCallback The {@link NetworkCallback} to be utilized for this request. Note
* the callback must not be shared - it uniquely specifies this request. * the callback must not be shared - it uniquely specifies this request.
* @param handler {@link Handler} to specify the thread upon which the callback will be invoked. * @param handler {@link Handler} to specify the thread upon which the callback will be invoked.
*
* @hide
*/ */
public void requestNetwork(NetworkRequest request, int timeoutMs, public void requestNetwork(NetworkRequest request, int timeoutMs,
NetworkCallback networkCallback, Handler handler) { NetworkCallback networkCallback, Handler handler) {
@@ -3214,7 +3211,6 @@ public class ConnectivityManager {
* @param networkCallback The {@link NetworkCallback} that the system will call as suitable * @param networkCallback The {@link NetworkCallback} that the system will call as suitable
* networks change state. * networks change state.
* @param handler {@link Handler} to specify the thread upon which the callback will be invoked. * @param handler {@link Handler} to specify the thread upon which the callback will be invoked.
* @hide
*/ */
public void registerNetworkCallback( public void registerNetworkCallback(
NetworkRequest request, NetworkCallback networkCallback, Handler handler) { NetworkRequest request, NetworkCallback networkCallback, Handler handler) {
@@ -3288,7 +3284,6 @@ public class ConnectivityManager {
* @param networkCallback The {@link NetworkCallback} that the system will call as the * @param networkCallback The {@link NetworkCallback} that the system will call as the
* system default network changes. * system default network changes.
* @param handler {@link Handler} to specify the thread upon which the callback will be invoked. * @param handler {@link Handler} to specify the thread upon which the callback will be invoked.
* @hide
*/ */
public void registerDefaultNetworkCallback(NetworkCallback networkCallback, Handler handler) { public void registerDefaultNetworkCallback(NetworkCallback networkCallback, Handler handler) {
// This works because if the NetworkCapabilities are null, // This works because if the NetworkCapabilities are null,