From cf25a54909c8c87a194a52b2c388419f734b86dd Mon Sep 17 00:00:00 2001 From: Ken Chen Date: Fri, 20 Oct 2023 16:42:17 +0800 Subject: [PATCH] Correct LINT path on UidOwnerMatchType UidOwnerMatchType Java definition moved from BpfNetMaps.java to BpfNetMapsConstants.java in change I6d7ea044e43180. Bug: 297836825 Test: presubmit Change-Id: I4fc28406750cac9143ea47e9304b455ab616d462 --- bpf_progs/netd.h | 2 +- framework/src/android/net/BpfNetMapsConstants.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bpf_progs/netd.h b/bpf_progs/netd.h index dd27bf9f93..4958040b18 100644 --- a/bpf_progs/netd.h +++ b/bpf_progs/netd.h @@ -190,7 +190,7 @@ enum UidOwnerMatchType { OEM_DENY_2_MATCH = (1 << 10), 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 { BPF_PERMISSION_INTERNET = 1 << 2, diff --git a/framework/src/android/net/BpfNetMapsConstants.java b/framework/src/android/net/BpfNetMapsConstants.java index 219168211a..e0527f5240 100644 --- a/framework/src/android/net/BpfNetMapsConstants.java +++ b/framework/src/android/net/BpfNetMapsConstants.java @@ -60,7 +60,7 @@ public class BpfNetMapsConstants { 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_3_MATCH = (1 << 11); - // LINT.ThenChange(packages/modules/Connectivity/bpf_progs/netd.h) + // LINT.ThenChange(../../../../bpf_progs/netd.h) public static final List> MATCH_LIST = Arrays.asList( Pair.create(HAPPY_BOX_MATCH, "HAPPY_BOX_MATCH"),