Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4bf90278 authored Jun 30, 2020 by markchien Committed by Mark Chien Jun 30, 2020

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

parent 89a59d29

packages/Tethering/jarjar-rules.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

packages/Tethering/tests/unit/jarjar-rules.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -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