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

Browse Source 
am: 784c93e372

* commit '784c93e372ff8ba8ca59499a8e35d83e5bd71c1a':
  Split network monitoring and portal probe events

Change-Id: I1e9208a9c8cd178ec31edf1755cc82db980b9071
This commit is contained in:
Hugo Benichi
2016-04-22 09:51:01 +00:00
committed by android-build-merger
parent 6a8a98c57a 134a18cdea
commit 76d7036002
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.UidRange;
import android.net.Uri; import android.net.Uri;
import android.net.metrics.DefaultNetworkEvent; import android.net.metrics.DefaultNetworkEvent;
import android.net.metrics.NetworkEvent;
import android.os.Binder; import android.os.Binder;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
@@ -2109,6 +2110,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
private void linger(NetworkAgentInfo nai) { private void linger(NetworkAgentInfo nai) {
nai.lingering = true; nai.lingering = true;
NetworkEvent.logEvent(nai.network.netId, NetworkEvent.NETWORK_LINGER);
nai.networkMonitor.sendMessage(NetworkMonitor.CMD_NETWORK_LINGER); nai.networkMonitor.sendMessage(NetworkMonitor.CMD_NETWORK_LINGER);
notifyNetworkCallbacks(nai, ConnectivityManager.CALLBACK_LOSING); notifyNetworkCallbacks(nai, ConnectivityManager.CALLBACK_LOSING);
} }
@@ -2122,6 +2124,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
nai.networkLingered.clear(); nai.networkLingered.clear();
if (!nai.lingering) return; if (!nai.lingering) return;
nai.lingering = false; nai.lingering = false;
NetworkEvent.logEvent(nai.network.netId, NetworkEvent.NETWORK_UNLINGER);
if (VDBG) log("Canceling linger of " + nai.name()); if (VDBG) log("Canceling linger of " + nai.name());
nai.networkMonitor.sendMessage(NetworkMonitor.CMD_NETWORK_CONNECTED); nai.networkMonitor.sendMessage(NetworkMonitor.CMD_NETWORK_CONNECTED);
} }