Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91c6a64a authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Event logging for lockdown VPN state changes. 

Bug: 7079350
Change-Id: I3670efe7f09c0fca55552b6a04a2be159b9beb3c
parent f56e2435

services/java/com/android/server/EventLogTags.logtags

+8 −0
Original line number Diff line number Diff line
@@ -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)

services/java/com/android/server/net/LockdownVpnTracker.java

+8 −0
Original line number Diff line number Diff line
@@ -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 {