Merge "ConnectivityManager: unhide methods with Handler argument" am: 0ba4ca681b am: b4db58d5c8

am: 1673f71afb

Change-Id: Ic575f187803548ce15965d6fde942a5322d9e35e
This commit is contained in:
Hugo Benichi
2017-03-13 07:18:54 +00:00
committed by android-build-merger

View File

@@ -2985,7 +2985,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) {
@@ -3102,8 +3101,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) {
@@ -3243,7 +3240,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) {
@@ -3317,7 +3313,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,