diff --git a/services/java/com/android/server/EventLogTags.logtags b/services/java/com/android/server/EventLogTags.logtags index dd50bebff50c2..39355d537ceac 100644 --- a/services/java/com/android/server/EventLogTags.logtags +++ b/services/java/com/android/server/EventLogTags.logtags @@ -148,3 +148,11 @@ option java_package com.android.server # --------------------------- 51100 netstats_mobile_sample (dev_rx_bytes|2|2),(dev_tx_bytes|2|2),(dev_rx_pkts|2|1),(dev_tx_pkts|2|1),(xt_rx_bytes|2|2),(xt_tx_bytes|2|2),(xt_rx_pkts|2|1),(xt_tx_pkts|2|1),(uid_rx_bytes|2|2),(uid_tx_bytes|2|2),(uid_rx_pkts|2|1),(uid_tx_pkts|2|1),(trusted_time|2|3) 51101 netstats_wifi_sample (dev_rx_bytes|2|2),(dev_tx_bytes|2|2),(dev_rx_pkts|2|1),(dev_tx_pkts|2|1),(xt_rx_bytes|2|2),(xt_tx_bytes|2|2),(xt_rx_pkts|2|1),(xt_tx_pkts|2|1),(uid_rx_bytes|2|2),(uid_tx_bytes|2|2),(uid_rx_pkts|2|1),(uid_tx_pkts|2|1),(trusted_time|2|3) + + +# --------------------------- +# LockdownVpnTracker.java +# --------------------------- +51200 lockdown_vpn_connecting (egress_net|1) +51201 lockdown_vpn_connected (egress_net|1) +51202 lockdown_vpn_error (egress_net|1) diff --git a/services/java/com/android/server/net/LockdownVpnTracker.java b/services/java/com/android/server/net/LockdownVpnTracker.java index dabcf2fff09b1..f2d67456c0fa1 100644 --- a/services/java/com/android/server/net/LockdownVpnTracker.java +++ b/services/java/com/android/server/net/LockdownVpnTracker.java @@ -41,6 +41,7 @@ import com.android.internal.net.VpnConfig; import com.android.internal.net.VpnProfile; import com.android.internal.util.Preconditions; import com.android.server.ConnectivityService; +import com.android.server.EventLogTags; import com.android.server.connectivity.Vpn; /** @@ -122,12 +123,18 @@ public class LockdownVpnTracker { } if (egressDisconnected) return; + final int egressType = egressInfo.getType(); + if (vpnInfo.getDetailedState() == DetailedState.FAILED) { + EventLogTags.writeLockdownVpnError(egressType); + } + if (mErrorCount > MAX_ERROR_COUNT) { showNotification(R.string.vpn_lockdown_error, R.drawable.vpn_disconnected); } else if (egressInfo.isConnected() && !vpnInfo.isConnectedOrConnecting()) { if (mProfile.isValidLockdownProfile()) { Slog.d(TAG, "Active network connected; starting VPN"); + EventLogTags.writeLockdownVpnConnecting(egressType); showNotification(R.string.vpn_lockdown_connecting, R.drawable.vpn_disconnected); mAcceptedEgressIface = egressProp.getInterfaceName(); @@ -148,6 +155,7 @@ public class LockdownVpnTracker { } Slog.d(TAG, "VPN connected using iface=" + iface + ", sourceAddr=" + sourceAddr); + EventLogTags.writeLockdownVpnConnected(egressType); showNotification(R.string.vpn_lockdown_connected, R.drawable.vpn_connected); try {