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

Commit ac7a897a authored Jul 01, 2020 by TreeHugger Robot Committed by Automerger Merge Worker Jul 01, 2020

Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev am: 6127ca43

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040945

Change-Id: I9db426581ba148b3743ac04a45af9bf4ea3089e4

parents f6bc5e25 6127ca43

packages/Tethering/jarjar-rules.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		# If there are files in that filegroup that are not covered below, the classes in the
		# module will be overwritten by the ones in the framework.
		rule com.android.internal.util.** com.android.networkstack.tethering.util.@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