LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Correct LINT path on UidOwnerMatchType" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-10-21 03:22:32 +00:00
committed by Gerrit Code Review
parent ef63fd1fa0 cf25a54909
commit 28f16f4269
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bpf_progs/netd.h
View File

@@ -190,7 +190,7 @@ enum UidOwnerMatchType {
OEM_DENY_2_MATCH = (1 << 10), OEM_DENY_2_MATCH = (1 << 10),
OEM_DENY_3_MATCH = (1 << 11), OEM_DENY_3_MATCH = (1 << 11),
}; };
// LINT.ThenChange(packages/modules/Connectivity/service/src/com/android/server/BpfNetMaps.java) // LINT.ThenChange(../framework/src/android/net/BpfNetMapsConstants.java)
enum BpfPermissionMatch { enum BpfPermissionMatch {
BPF_PERMISSION_INTERNET = 1 << 2, BPF_PERMISSION_INTERNET = 1 << 2,

2
framework/src/android/net/BpfNetMapsConstants.java
View File

@@ -60,7 +60,7 @@ public class BpfNetMapsConstants {
public static final long OEM_DENY_1_MATCH = (1 << 9); public static final long OEM_DENY_1_MATCH = (1 << 9);
public static final long OEM_DENY_2_MATCH = (1 << 10); public static final long OEM_DENY_2_MATCH = (1 << 10);
public static final long OEM_DENY_3_MATCH = (1 << 11); public static final long OEM_DENY_3_MATCH = (1 << 11);
// LINT.ThenChange(packages/modules/Connectivity/bpf_progs/netd.h) // LINT.ThenChange(../../../../bpf_progs/netd.h)
public static final List<Pair<Long, String>> MATCH_LIST = Arrays.asList( public static final List<Pair<Long, String>> MATCH_LIST = Arrays.asList(
Pair.create(HAPPY_BOX_MATCH, "HAPPY_BOX_MATCH"), Pair.create(HAPPY_BOX_MATCH, "HAPPY_BOX_MATCH"),