joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Remove unused enums for firewall in Common.h" into main

Browse source
This commit is contained in:
Maciej Żenczykowski 2023-11-08 09:03:41 +00:00 • committed by Gerrit Code Review
commit bc4af4e1d0
2 changed files with 0 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
framework/src/android/net/ConnectivityManager.java
View file

@ -963,7 +963,6 @@ public class ConnectivityManager {
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562)
private final IConnectivityManager mService;
// LINT.IfChange(firewall_chain)
/**
* Firewall chain for device idle (doze mode).
* Allowlist of apps that have network access in device idle.
@ -1068,7 +1067,6 @@ public class ConnectivityManager {
FIREWALL_CHAIN_OEM_DENY_3
})
public @interface FirewallChain {}
// LINT.ThenChange(packages/modules/Connectivity/service/native/include/Common.h)
/**
* A firewall rule which allows or drops packets depending on existing policy.

22
service/native/include/Common.h
View file

@ -22,25 +22,3 @@
using aidl::android::net::INetd;
static_assert(INetd::CLAT_MARK == CLAT_MARK, "must be 0xDEADC1A7");
enum FirewallRule { ALLOW = INetd::FIREWALL_RULE_ALLOW, DENY = INetd::FIREWALL_RULE_DENY };
// ALLOWLIST means the firewall denies all by default, uids must be explicitly ALLOWed
// DENYLIST means the firewall allows all by default, uids must be explicitly DENYed
enum FirewallType { ALLOWLIST = INetd::FIREWALL_ALLOWLIST, DENYLIST = INetd::FIREWALL_DENYLIST };
// LINT.IfChange(firewall_chain)
enum ChildChain {
NONE = 0,
DOZABLE = 1,
STANDBY = 2,
POWERSAVE = 3,
RESTRICTED = 4,
LOW_POWER_STANDBY = 5,
OEM_DENY_1 = 7,
OEM_DENY_2 = 8,
OEM_DENY_3 = 9,
INVALID_CHAIN
};
// LINT.ThenChange(packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java)