Merge changes Ic6ff7a3d,Iff9b9792
* changes: Refactor code and improve tests for VPN filtering Remove LOCKDOWN from FirewallChain IntDef
This commit is contained in:
commit
5d787feef0
1 changed files with 185 additions and 188 deletions
|
|
@ -982,16 +982,6 @@ public class ConnectivityManager {
|
|||
@SystemApi(client = MODULE_LIBRARIES)
|
||||
public static final int FIREWALL_CHAIN_LOW_POWER_STANDBY = 5;
|
||||
|
||||
/**
|
||||
* Firewall chain used for lockdown VPN.
|
||||
* Denylist of apps that cannot receive incoming packets except on loopback because they are
|
||||
* subject to an always-on VPN which is not currently connected.
|
||||
*
|
||||
* @see #BLOCKED_REASON_LOCKDOWN_VPN
|
||||
* @hide
|
||||
*/
|
||||
public static final int FIREWALL_CHAIN_LOCKDOWN_VPN = 6;
|
||||
|
||||
/**
|
||||
* Firewall chain used for OEM-specific application restrictions.
|
||||
* Denylist of apps that will not have network access due to OEM-specific restrictions.
|
||||
|
|
@ -1024,7 +1014,6 @@ public class ConnectivityManager {
|
|||
FIREWALL_CHAIN_POWERSAVE,
|
||||
FIREWALL_CHAIN_RESTRICTED,
|
||||
FIREWALL_CHAIN_LOW_POWER_STANDBY,
|
||||
FIREWALL_CHAIN_LOCKDOWN_VPN,
|
||||
FIREWALL_CHAIN_OEM_DENY_1,
|
||||
FIREWALL_CHAIN_OEM_DENY_2,
|
||||
FIREWALL_CHAIN_OEM_DENY_3
|
||||
|
|
|
|||
Loading…
Reference in a new issue