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

Commit 14fcbfbe authored by Rahul Sabnis's avatar Rahul Sabnis Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "Rename net-utils-framework-common in FrameworksTelephony..."" am: 201b7876 am: db053eb9 am: 21fb442f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic0e4a5bf07724dd4c49633b8a4c83366435e12f6
parents 3b076189 21fb442f

tests/telephonytests/jarjar-rules-tests.txt

+0 −6
Original line number Diff line number Diff line
@@ -4,9 +4,3 @@ 
# 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