LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Update UpstreamNetworkMonitor to use custom Handlers" am: 35c89886c2 am: baaa19d65a

Browse Source 
am: c239511cdb

Change-Id: I9a210b4896810e7365b2403495716395b3866650
This commit is contained in:
Erik Kline
2017-02-24 08:24:51 +00:00
committed by android-build-merger
parent 9840818598 baaa19d65a
commit 2762541780
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

@@ -2952,15 +2952,6 @@ public class ConnectivityManager {
* @hide * @hide
*/ */
public void requestNetwork(NetworkRequest request, NetworkCallback networkCallback, 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) { int timeoutMs, int legacyType, Handler handler) {
CallbackHandler cbHandler = new CallbackHandler(handler); CallbackHandler cbHandler = new CallbackHandler(handler);
NetworkCapabilities nc = request.networkCapabilities; NetworkCapabilities nc = request.networkCapabilities;
@@ -3062,7 +3053,7 @@ public class ConnectivityManager {
public void requestNetwork(NetworkRequest request, NetworkCallback networkCallback, public void requestNetwork(NetworkRequest request, NetworkCallback networkCallback,
int timeoutMs) { int timeoutMs) {
int legacyType = inferLegacyTypeForNetworkCapabilities(request.networkCapabilities); int legacyType = inferLegacyTypeForNetworkCapabilities(request.networkCapabilities);
requestNetwork(request, networkCallback, timeoutMs, legacyType); requestNetwork(request, networkCallback, timeoutMs, legacyType, getDefaultHandler());
} }