LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix jarjar-related failures in coverage tests"

Browse Source
This commit is contained in:
Remi NGUYEN VAN
2021-07-15 05:19:18 +00:00
committed by Gerrit Code Review
parent ca688d62d3 ed8efa75b4
commit e9f7f1e3d4
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
service/jarjar-rules.txt
View File

@@ -2,12 +2,17 @@ rule android.sysprop.** com.android.connectivity.@0
rule com.android.net.module.util.** com.android.connectivity.@0 rule com.android.net.module.util.** com.android.connectivity.@0
rule com.android.modules.utils.** com.android.connectivity.@0 rule com.android.modules.utils.** com.android.connectivity.@0
# internal util classes # internal util classes from framework-connectivity-shared-srcs
rule android.util.LocalLog* com.android.connectivity.@0 rule android.util.LocalLog* com.android.connectivity.@0
# android.util.IndentingPrintWriter* should use a different package name from # android.util.IndentingPrintWriter* should use a different package name from
# the one in com.android.internal.util # the one in com.android.internal.util
rule android.util.IndentingPrintWriter* com.android.connectivity.@0 rule android.util.IndentingPrintWriter* com.android.connectivity.@0
rule com.android.internal.util.** com.android.connectivity.@0 rule com.android.internal.util.IndentingPrintWriter* com.android.connectivity.@0
rule com.android.internal.util.IState* com.android.connectivity.@0
rule com.android.internal.util.MessageUtils* com.android.connectivity.@0
rule com.android.internal.util.State* com.android.connectivity.@0
rule com.android.internal.util.StateMachine* com.android.connectivity.@0
rule com.android.internal.util.WakeupMessage* com.android.connectivity.@0
rule com.android.internal.messages.** com.android.connectivity.@0 rule com.android.internal.messages.** com.android.connectivity.@0
rule com.google.protobuf.** com.android.connectivity.@0 rule com.google.protobuf.** com.android.connectivity.@0
@@ -26,7 +31,10 @@ rule android.net.NetworkFactory* com.android.connectivity.@0
# From netd-client (newer AIDLs should go to android.net.netd.aidl) # From netd-client (newer AIDLs should go to android.net.netd.aidl)
rule android.net.netd.aidl.** com.android.connectivity.@0 rule android.net.netd.aidl.** com.android.connectivity.@0
rule android.net.INetd* com.android.connectivity.@0 # Avoid including android.net.INetdEventCallback, used in tests but not part of the module
rule android.net.INetd com.android.connectivity.@0
rule android.net.INetd$* com.android.connectivity.@0
rule android.net.INetdUnsolicitedEventListener* com.android.connectivity.@0
rule android.net.InterfaceConfigurationParcel* com.android.connectivity.@0 rule android.net.InterfaceConfigurationParcel* com.android.connectivity.@0
rule android.net.MarkMaskParcel* com.android.connectivity.@0 rule android.net.MarkMaskParcel* com.android.connectivity.@0
rule android.net.NativeNetworkConfig* com.android.connectivity.@0 rule android.net.NativeNetworkConfig* com.android.connectivity.@0

4
tests/unit/java/android/net/KeepalivePacketDataUtilTest.java
View File

@@ -168,8 +168,8 @@ public final class KeepalivePacketDataUtilTest {
assertEquals(resultData.tos, tos); assertEquals(resultData.tos, tos);
assertEquals(resultData.ttl, ttl); assertEquals(resultData.ttl, ttl);
final String expected = "" final String expected = TcpKeepalivePacketDataParcelable.class.getName()
+ "android.net.TcpKeepalivePacketDataParcelable{srcAddress: [10, 0, 0, 1]," + "{srcAddress: [10, 0, 0, 1],"
+ " srcPort: 1234, dstAddress: [10, 0, 0, 5], dstPort: 4321, seq: 286331153," + " srcPort: 1234, dstAddress: [10, 0, 0, 5], dstPort: 4321, seq: 286331153,"
+ " ack: 572662306, rcvWnd: 48000, rcvWndScale: 2, tos: 4, ttl: 64}"; + " ack: 572662306, rcvWnd: 48000, rcvWndScale: 2, tos: 4, ttl: 64}";
assertEquals(expected, resultData.toString()); assertEquals(expected, resultData.toString());