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

Merge "Split network monitoring and portal probe events" into nyc-dev am: 784c93e372 am: cbb0d77bcd

Browse Source 
am: c7dd9c517e

* commit 'c7dd9c517eebb42bfcafd26f29ac5900d1dff77d':
  Split network monitoring and portal probe events

Change-Id: I4cd3eeb25f63fe3731883ec2cc4fbfc3602bfba8
This commit is contained in:
Hugo Benichi
2016-04-22 09:55:38 +00:00
committed by android-build-merger
parent fa28d8952f c7dd9c517e
commit b2f3eeb1c2
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -72,6 +72,7 @@ import android.net.RouteInfo;
import android.net.UidRange;
import android.net.Uri;
import android.net.metrics.DefaultNetworkEvent;
import android.net.metrics.NetworkEvent;
import android.os.Binder;
import android.os.Build;
import android.os.Bundle;
@@ -2112,6 +2113,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
private void linger(NetworkAgentInfo nai) {
nai.lingering = true;
NetworkEvent.logEvent(nai.network.netId, NetworkEvent.NETWORK_LINGER);
nai.networkMonitor.sendMessage(NetworkMonitor.CMD_NETWORK_LINGER);
notifyNetworkCallbacks(nai, ConnectivityManager.CALLBACK_LOSING);
}
@@ -2125,6 +2127,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
nai.networkLingered.clear();
if (!nai.lingering) return;
nai.lingering = false;
NetworkEvent.logEvent(nai.network.netId, NetworkEvent.NETWORK_UNLINGER);
if (VDBG) log("Canceling linger of " + nai.name());
nai.networkMonitor.sendMessage(NetworkMonitor.CMD_NETWORK_CONNECTED);
}