From d61bd7860231f1bcc37fdb55032c1f5d9f53bd7c Mon Sep 17 00:00:00 2001 From: Yan Yan Date: Wed, 22 Jan 2025 01:25:52 +0000 Subject: [PATCH] Jarjar IndentingPrintWriter with android.net.connectivity prefix This patch is to fix NoSuchMethodError thrown from VCN dumpsys when VCN is in the Tethering mainline module. Because VCN is in Tethering module, the VCN service will use a jarjared IndentingPrintWriter. During dumpsys, VcnManagementService#dump will create a IndentingPrintWriter and pass it to VcnUnderlyingNetworkTemplate#dump. Then because VcnUnderlyingNetworkTemplate fails to recognize the jarjared class, it will throw NoSuchMethodError. This patch fixes this issue by also jarjaring the IndentingPrintWriter in VCN framework library. It is aligned with the end state where all classes in the VCN framework code except APIs will be jarjared to have a android.net.connectivity prefix Bug: 390490391 Bug: 386225194 Test: atest CtsVcnTestCases(new tests) Flag: EXEMPT; low risk and small scope bug fix Change-Id: I34be6dbf816c752f6ba0b77dc4ad98c8ad71e743 --- Vcn/framework-b/framework-vcn-jarjar-rules.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Vcn/framework-b/framework-vcn-jarjar-rules.txt b/Vcn/framework-b/framework-vcn-jarjar-rules.txt index 7e27b24f74..33287b7f34 100644 --- a/Vcn/framework-b/framework-vcn-jarjar-rules.txt +++ b/Vcn/framework-b/framework-vcn-jarjar-rules.txt @@ -1,2 +1,3 @@ rule android.net.vcn.persistablebundleutils.** android.net.connectivity.android.net.vcn.persistablebundleutils.@1 -rule android.net.vcn.util.** android.net.connectivity.android.net.vcn.util.@1 \ No newline at end of file +rule android.net.vcn.util.** android.net.connectivity.android.net.vcn.util.@1 +rule android.util.IndentingPrintWriter android.net.connectivity.android.util.IndentingPrintWriter \ No newline at end of file