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

Commit f089dd73 authored by Mark Chien's avatar Mark Chien Committed by Automerger Merge Worker
Browse files

Merge "Fix tethering jarjar rule for LocalLog" am: f64be2d7 

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

Change-Id: Ia21b091951f7e5dd3f879d68414653a6c9ff8b25
parents f8067959 f64be2d7

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