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

Commit 1f8dd5a7 authored by Xiao Ma's avatar Xiao Ma
Browse files

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

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

Merged-In: Iae09e71533b2a4da837caeedd73a2b63885e07bb
(cherry picked from commit d42577f3)

Change-Id: I5aef0f24a060101030f8b690cf5558b443806471
parent 6d526df1

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