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

Commit cac830fd authored by Xiao Ma's avatar Xiao Ma Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "Rename net-utils-framework-common in... 

Merge "Revert "Revert "Rename net-utils-framework-common in FrameworksTelephony...""" am: c82b7b26 am: 71193dd5

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1611873

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I359b540def41a399289f1929ce0028d4b2b0ad2d
parents 0aaaf7a3 71193dd5

tests/telephonytests/jarjar-rules-tests.txt

+6 −0
Original line number Diff line number Diff line
@@ -4,3 +4,9 @@ 
# by services-net and one by telephony-common), similarly to what happens on a

# real device, except that in the test they have different package names.

rule android.net.NetworkFactory* android.net.services.NetworkFactory@1



# Telephony-common has already included net-utils-framework-common lib and jarjars

# the package name. FrameworksTelephonyTests also includes net-utils-framework-common

# via net-tests-utils and tries to jarjar it again. Rename the package name with

# differnt prefix in the test jarjar rule to avoid duplicate jar entries.

rule com.android.net.module.util.** com.android.internal.telephony.util.test.@1