joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Update UpstreamNetworkMonitor to use custom Handlers"

Browse source 
am: 35c89886c2

Change-Id: I76433822a9b7c124e4b7cfcf2a20cb0e43a60199
This commit is contained in:
Erik Kline 2017-02-24 08:15:19 +00:00 • committed by android-build-merger
commit baaa19d65a
1 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
core/java/android/net/ConnectivityManager.java
View file

@ -2930,15 +2930,6 @@ public class ConnectivityManager {
* @hide
*/
public void requestNetwork(NetworkRequest request, NetworkCallback networkCallback,
int timeoutMs, int legacyType) {
requestNetwork(request, networkCallback, timeoutMs, legacyType, getDefaultHandler());
}
/**
* Helper function to request a network with a particular legacy type.
* @hide
*/
private void requestNetwork(NetworkRequest request, NetworkCallback networkCallback,
int timeoutMs, int legacyType, Handler handler) {
CallbackHandler cbHandler = new CallbackHandler(handler);
NetworkCapabilities nc = request.networkCapabilities;
@ -3040,7 +3031,7 @@ public class ConnectivityManager {
public void requestNetwork(NetworkRequest request, NetworkCallback networkCallback,
int timeoutMs) {
int legacyType = inferLegacyTypeForNetworkCapabilities(request.networkCapabilities);
requestNetwork(request, networkCallback, timeoutMs, legacyType);
requestNetwork(request, networkCallback, timeoutMs, legacyType, getDefaultHandler());
}