From a8ac97cf22fb7016d87b68f1aabb30d6cfd9d5f4 Mon Sep 17 00:00:00 2001 From: markchien Date: Tue, 30 Jun 2020 22:56:12 +0800 Subject: [PATCH] Fix tethering jarjar rule for LocalLog LocalLog is in android.util* instead of android.net*. No crash happen becaue the methods used by tethering are @UnsupportedAppUsage. Bug: 160113128 Test: atest TetheringTests (cherry-pick from internal branch with conflicts) Merged-In: I5f070b96f96aaabf7ec8da52a3d3444ed940fb56 Change-Id: I5f070b96f96aaabf7ec8da52a3d3444ed940fb56 --- Tethering/jarjar-rules.txt | 2 +- Tethering/tests/unit/jarjar-rules.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tethering/jarjar-rules.txt b/Tethering/jarjar-rules.txt index 8f072e4cd2..2c4059dda9 100644 --- a/Tethering/jarjar-rules.txt +++ b/Tethering/jarjar-rules.txt @@ -12,7 +12,7 @@ rule com.android.internal.util.State* com.android.networkstack.tethering.util.St rule com.android.internal.util.StateMachine* com.android.networkstack.tethering.util.StateMachine@1 rule com.android.internal.util.TrafficStatsConstants* com.android.networkstack.tethering.util.TrafficStatsConstants@1 -rule android.net.LocalLog* com.android.networkstack.tethering.LocalLog@1 +rule android.util.LocalLog* com.android.networkstack.tethering.util.LocalLog@1 rule android.net.shared.Inet4AddressUtils* com.android.networkstack.tethering.shared.Inet4AddressUtils@1 diff --git a/Tethering/tests/unit/jarjar-rules.txt b/Tethering/tests/unit/jarjar-rules.txt index 1ea56cdf1a..ec2d2b0200 100644 --- a/Tethering/tests/unit/jarjar-rules.txt +++ b/Tethering/tests/unit/jarjar-rules.txt @@ -8,4 +8,4 @@ rule com.android.internal.util.State* com.android.networkstack.tethering.util.St rule com.android.internal.util.StateMachine* com.android.networkstack.tethering.util.StateMachine@1 rule com.android.internal.util.TrafficStatsConstants* com.android.networkstack.tethering.util.TrafficStatsConstants@1 -rule android.net.LocalLog* com.android.networkstack.tethering.LocalLog@1 +rule android.util.LocalLog* com.android.networkstack.tethering.util.LocalLog@1