summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yan Yan <evitayan@google.com> 2025-01-22 01:25:52 +0000
committer Yan Yan <evitayan@google.com> 2025-01-22 11:26:17 -0800
commit4a9f8f01ca3ab3f0c5bf628b58e3a2ab53011534 (patch)
tree60cc1e3b9f6084037c20643036da73c3692066ec
parenta9e2d996d1dc63c00174002fb4bf75f05a89214c (diff)
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
-rw-r--r--packages/Vcn/framework-b/framework-vcn-jarjar-rules.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/Vcn/framework-b/framework-vcn-jarjar-rules.txt b/packages/Vcn/framework-b/framework-vcn-jarjar-rules.txt
index 7e27b24f749c..33287b7f3449 100644
--- a/packages/Vcn/framework-b/framework-vcn-jarjar-rules.txt
+++ b/packages/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