commit a8ac97cf22fb7016d87b68f1aabb30d6cfd9d5f4
author markchien <markchien@google.com> Tue Jun 30 22:56:12 2020 +0800
committer Mark Chien <markchien@google.com> Tue Jun 30 15:30:55 2020 +0000
tree 00a592064c3bd4d7a7d4dc2f6cd570cd34f42055
parent c6b2c39d04d0a79859ffe9e892bf957f317db7d1

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

diff --git a/Tethering/jarjar-rules.txt b/Tethering/jarjar-rules.txt
index 8f072e4..2c4059d 100644
--- a/Tethering/jarjar-rules.txt
+++ b/Tethering/jarjar-rules.txt
@@ -12,7 +12,7 @@
 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