summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-05-25Merge "Mock IpConnectivityLog in IpClientTest" into rvc-dev am: 7bfc08f95fMark Chien
Change-Id: I51ebbe9555926dcc4afd8ea51bfadfc89472a335
2020-05-25Merge "Support MirrorLink DHCPDECLINE." into rvc-dev am: b664b89668Xiao Ma
Change-Id: I523340e2cb5257f4cb108742bebae21fbb001cfb
2020-05-25Merge "Mock IpConnectivityLog in IpClientTest" into rvc-devMark Chien
2020-05-25Merge "Support MirrorLink DHCPDECLINE." into rvc-devXiao Ma
2020-05-25Mock IpConnectivityLog in IpClientTestmarkchien
IpConnectivityLog which is used to send metrics need NETWORK_STACK permission. Mock IpConnectivityLog to avoid sending metrics from tests. Also remove platform cert from the network stack unit test because it is not necessary for any signature permission anymore. Bug: 156866746 Test: NetworkStackNextTests, NetworkStackCoverageTests, TetheringTests, TetheringCoverageTests Change-Id: Ibff052b30e000de3c5a08d7265c7642d67d9b0d0
2020-05-25Merge "Avoid rely on NETWORK_STACK permission for InetDiagSocketTest" into ↵Mark Chien
rvc-dev am: 4376550b5b am: cbde20de36 Change-Id: I35dd19a69b9e1ed605b8971d188c2bac53b7a57a
2020-05-25Merge "Avoid rely on NETWORK_STACK permission for InetDiagSocketTest" into ↵Mark Chien
rvc-dev am: 4376550b5b Change-Id: I6605a9a8860d93212c036d9456d4622f8218d45f
2020-05-25Merge "Avoid rely on NETWORK_STACK permission for InetDiagSocketTest" into ↵Mark Chien
rvc-dev
2020-05-25Avoid rely on NETWORK_STACK permission for InetDiagSocketTestmarkchien
ConnectivityManager#getConnectionOwnerUid required NETWORK_STACK permission. Move related tests from InetDiagSocketTest(unit test) to InetDiagSocketIntegrationTest. The test is an integration test and not a unit test, as its purpose is to exercise the getConnectionOwnerUid platform API. Since network stack unit test is shared with TetheringCoverageTests, this is part of work to avoid rely on platform cert for TetheringCoverageTests. Bug: 156866746 Test: TetheringCoverageTest, NetworkStackNextTests, NetworkStackCoverageTests Change-Id: Ic38852839ead951972daa24f27ac95376787a72c
2020-05-25Merge "Remove unused permission from NetworkStackTests" into rvc-dev am: ↵TreeHugger Robot
e56fc334ad am: 24cf1c906f Change-Id: I361fd746d2b393071e5af8cda6eb91530eb67aaf
2020-05-25Remove unused ACCESS_NETWORK_STATE permission am: af35481fe9 am: 9a87679fadMark Chien
Change-Id: Iae6b740a268b1f274c387020646b17bac1443dfa
2020-05-25Merge "Remove unused permission from NetworkStackTests" into rvc-dev am: ↵TreeHugger Robot
e56fc334ad Change-Id: Ie861f49885a2b7a0a94f915e0853fa0bbc779c20
2020-05-25Remove unused ACCESS_NETWORK_STATE permission am: af35481fe9Mark Chien
Change-Id: Ia4b80e85d109e0154bfa3375116b31d9d4c42698
2020-05-25Merge "Remove unused permission from NetworkStackTests" into rvc-devTreeHugger Robot
2020-05-21add TCP data stall metricsChiachang Wang
Current metrics contains only DNS signal. Given TCP info is also considered to detection data stall, the related TCP information should be included into metrics. Bug: 150182763 Test: atest NetworkStackTests NetworkStackNextTests Test: Test with ./out/host/linux-x86/bin/statsd_testdrive 121 to ensure log properly Merged-In: I5e306299f3cf4f49c46f161cd0aa4cb40d1ab76e Change-Id: I5e306299f3cf4f49c46f161cd0aa4cb40d1ab76e
2020-05-21Remove unused permission from NetworkStackTestsMark Chien
Since TetheringCoverageTests would include NetworkStackTestsLib and tethering has unit test case that tests permission. That test would assume the test package do not define some permission and use adopt/drop shell permission to simulate whether caller hold testing permission. Remove it to avoid to be inherited by its user(TetheringCoverageTests). Bug: 154869719 Test: TetheringCoverageTests, NetworkStackTests, NetworkStackNextTests Merged-In: Iac917ddaad32ae4549b7f8d376de8492a958fbeb Change-Id: Iac917ddaad32ae4549b7f8d376de8492a958fbeb
2020-05-20Remove unused ACCESS_NETWORK_STATE permissionMark Chien
Since TetheringCoverageTests would include NetworkStackTestsLib and tethering has unit test case that tests ACCESS_NETWORK_STATE permission. That test would assume the test package do not define ACCESS_NETWORK_STATE permission and use adopt/drop shell permission to simulate whether caller hold ACCESS_NETWORK_STATE permission. Since NetworkStackTests do not use ACCESS_NETWORK_STATE permission, remove it to avoid to be inherited by its user(TetheringCoverageTests). Bug: 154869719 Test: TetheringCoverageTests, NetworkStackTests, NetworkStackNextTests Merged-In: Ic45add1eaed0bd30788544b1b5bfd0f39a85a364 Change-Id: Ic45add1eaed0bd30788544b1b5bfd0f39a85a364
2020-05-20Fix flakes in testMultipleProbesRemi NGUYEN VAN
If a conclusive probe finishes before other probes start, some probes may not call Network#openConnection, as the executor is shut down immediately. Test: atest NetworkMonitorTest#testMultipleProbesOnValidNetwork \ --rerun-until-failure 500 Bug: 139314310 Original-Change: https://android-review.googlesource.com/1299380 Merged-In: Ica21c23af0472edc6ead123365b39e42e69f85cb Change-Id: Ica21c23af0472edc6ead123365b39e42e69f85cb
2020-05-20Rename variables and methods specifically am: 5abdc91e97 am: 47c393d530Chiachang Wang
Change-Id: Idd450533026050a2ad227226749c0128f3fc4b47
2020-05-20Rename variables and methods specifically am: 5abdc91e97Chiachang Wang
Change-Id: I8b0773a17a3fb3be8cf743c77a488478fbedf41b
2020-05-20Rename variables and methods specificallyChiachang Wang
Bug: 150182763 Test: atest NetworkStackTests Merged-In: I646b4b58df20d1a280c0f472b4573dc350349cc3 Change-Id: I646b4b58df20d1a280c0f472b4573dc350349cc3
2020-05-19Adjust the timeout parameters in DHCP client.Xiao Ma
MAX_TIMEOUT_MS: 128s -> 512s, battery drain for DHCP packet retransmit. FIRST_TIMEOUT_MS: 2s -> 1s, shorten DHCP packet retransmit interval. DEFAULT_TIMEOUT_MS: 36s -> 18s, quickly detect provisioning timeout. Bug: 131781810 Test: atest NetworkStackIntegrationTests NetworkStackTests Merged-In: Ie162b0d59da0082cd0c5ec02bb391c3d27f40607 Change-Id: Ie162b0d59da0082cd0c5ec02bb391c3d27f40607
2020-05-19Refactor DHCP server with StateMachine. am: 1f20cb6617 am: db59c2f0beXiao Ma
Change-Id: Ibc65accb172c52bf2d779684bb35cedb24fb6e5d
2020-05-19Refactor DHCP server with StateMachine. am: 1f20cb6617Xiao Ma
Change-Id: Iaf68009b10c7a61530b9a78394b9d4baa4c59145
2020-05-19Support MirrorLink DHCPDECLINE.Xiao Ma
Bug: 130741856 Test: atest NetworkStackTests NetworkStackNextTests Merged-In: I9f558ce0838c87d9bb0ef519ee7c91e16f3bb066 Change-Id: I9f558ce0838c87d9bb0ef519ee7c91e16f3bb066
2020-05-18Refactor DHCP server with StateMachine.Xiao Ma
To support DHCPDECLINE message and request a new prefix from IpServer, a WaitState is required to wait until IpServer allocates a different prefix and completes configuring this prefix/route. Then server could resume from pausing DHCP packets listening. From this point, StateMachine is easier to add a WaitState for implementation. Refactor DHCP server by replacing ThreadHandler with StateMachine first. Bug: 130741856 Test: atest NetworkStackTests NetworkStackNextTests Test: manual test: connect wifi, turn on hotspot, downstream device attaches to hotspot successfully, then turn off hotspot, repeat multiple times. Merged-In: I6c09d9c371e9c4e71d8ba26adaed640e3b97437b Change-Id: I6c09d9c371e9c4e71d8ba26adaed640e3b97437b
2020-05-18Remove system_current workaround on NetworkStack am: 38dc83450b am: 166b6df625Remi NGUYEN VAN
Change-Id: I5653ec3f20183b6998d5a69beeb8e9bc27619c3c
2020-05-18Remove system_current workaround on NetworkStack am: 38dc83450bRemi NGUYEN VAN
Change-Id: I052b31aa1c869e9628b8b0092cbdaea978599e1b
2020-05-18Remove system_current workaround on NetworkStackRemi NGUYEN VAN
Now that system_30 APKs can be built, use system_30 instead of system_current when building NetworkStack. Bug: 143586229 Test: m Change-Id: If5246c9b8b1534df359cf3f1ec921f8de110e742
2020-05-18Merge "Bump NetworkStack to system_30" into rvc-dev am: 7bb940e60c am: ↵Remi NGUYEN VAN
b204e4f350 Change-Id: Ie46825ae3ab819b3a1acac32cb62c36e28e50ae8
2020-05-18Merge "Bump NetworkStack to system_30" into rvc-dev am: 7bb940e60cRemi NGUYEN VAN
Change-Id: If7eb57970705615e892e73bc1144e12335228a49
2020-05-18Merge "Bump NetworkStack to system_30" into rvc-devRemi NGUYEN VAN
2020-05-18Merge changes I86cb5af0,I706e40db into rvc-dev am: d8fa66857c am: 74e2c3c2b8Remi NGUYEN VAN
Change-Id: Ic6491403523ffe5fdbd236526f0ae79da1e5fe77
2020-05-18Log interface hash in NetworkStack dumpsys version am: 1775216730 am: d5bf52cbacRemi NGUYEN VAN
Change-Id: I78c6ca0a337984ccbf86907732e5c6a25ba08813
2020-05-18Do not mock shim in TcpSocketTrackerTest am: 9eb5c2c37c am: 3964132b70Remi NGUYEN VAN
Change-Id: I813e6a8dcd4f8666ae176777ef2e1ff9dff5b40b
2020-05-18Move common apishim classes to apishim.common pkg am: 473501ff16 am: ea5b554c80Remi NGUYEN VAN
Change-Id: Iafd89ce79c00042b01a8b97223dd966e655def05
2020-05-18Merge changes I86cb5af0,I706e40db into rvc-dev am: d8fa66857cRemi NGUYEN VAN
Change-Id: Id47bf8faf80d5f74b094ffa6785092053ab3a0ab
2020-05-18Log interface hash in NetworkStack dumpsys version am: 1775216730Remi NGUYEN VAN
Change-Id: I24c6372999ba79ee29bb636b97e49885b09460bb
2020-05-18Do not mock shim in TcpSocketTrackerTest am: 9eb5c2c37cRemi NGUYEN VAN
Change-Id: Ib57296be2549c1ecc9d4e34561e3d9686dafb341
2020-05-18Move common apishim classes to apishim.common pkg am: 473501ff16Remi NGUYEN VAN
Change-Id: I79a4d7d0dd8f7bc5be20e9060f797d03d3843c9b
2020-05-18Merge changes I86cb5af0,I706e40db into rvc-devRemi NGUYEN VAN
* changes: Fix dumpVersion for IpMemoryStore on Q Log interface hash in NetworkStack dumpsys version
2020-05-18Bump NetworkStack to system_30Remi NGUYEN VAN
NetworkStack can use system_30 now that system_30 exists. This change moves the "current" API shims to api30, and adds an api31 shim. Test: atest NetworkStackTests NetworkStackNextTests, manual (Wifi, telephony working) Bug: 143586229 Change-Id: I37ca0e5a8a5c5620f5fed478648853b668e87f50
2020-05-15Do not mock shim in TcpSocketTrackerTestRemi NGUYEN VAN
Instead of mocking the shim, the test needs to run only on platforms that support the feature, and can provide test versions of the underlying objects (here Network). Also move the SDK version check to TcpSocketTracker itself, as users of TcpSocketTracker should not be able to set isTcpInfoParsingSupported to true on Q. Bug: 143586229 Test: atest NetworkStackTests NetworkStackNextTests on Q and R Change-Id: I580ae9ded468d3f08da336b160596484938bf2a5 Merged-In: I580ae9ded468d3f08da336b160596484938bf2a5 (cherry picked from commit 3ad1d5f0fbfff40d3dc66c3c68f103a9b2d3f5ef)
2020-05-15Move common apishim classes to apishim.common pkgRemi NGUYEN VAN
This provides a better separation of the classes based on their role (an actual shim, or an interface or utility common to all shims), and forces the apishim package to import the common classes, which makes it easier at SDK bump time since the imports do not need to be added at that point. Bug: 143586229 Test: atest NetworkStackTests Original-Change: https://android-review.googlesource.com/1310517 Merged-In: Ie77c17a96a67016f35890afa065bea0a07b09504 Change-Id: Ie77c17a96a67016f35890afa065bea0a07b09504
2020-05-15Fix dumpVersion for IpMemoryStore on QTreehugger Robot
IpMemoryStore was considered part of the system server AIDLs in Q, so its version must be part of the system server versions set. This fixes a regression on testDumpVersion_Q. Bug: 137328719 Test: atest NetworkStackTests:NetworkStackServiceTest on a Q device Change-Id: I86cb5af059fe81fe9f10555d57096164665205db Merged-In: I86cb5af059fe81fe9f10555d57096164665205db (cherry picked from commit 8b5cead3df4489a0fd8d9950761a387d2c8d02b4)
2020-05-15Log interface hash in NetworkStack dumpsys versionRemi NGUYEN VAN
The hash is logged similarly to how version code was logged, and will be used to verify that valid interfaces are used to communicate with NetworkStack. Bug: 137328719 Test: atest NetworkStackTests:NetworkStackServiceTest Original-Change: https://android-review.googlesource.com/1293755 Merged-In: I706e40dbe884ffa545f9127e29616a65d5f69c53 Change-Id: I706e40dbe884ffa545f9127e29616a65d5f69c53
2020-05-14Merge "Add test for NetworkStackService dumpsys version" into rvc-dev am: ↵Remi NGUYEN VAN
5f6620bce2 am: b785624bd4 Change-Id: I33116352c9e304ec0dd1da53b044a0c6994dd636
2020-05-14Merge "Add test for NetworkStackService dumpsys version" into rvc-dev am: ↵Remi NGUYEN VAN
5f6620bce2 Change-Id: I3eb58c9a84e41945cef14e676c979c3997cddc4c
2020-05-14Merge "Add test for NetworkStackService dumpsys version" into rvc-devRemi NGUYEN VAN
2020-05-13Merge "Set min_sdk_version to be part of mainline modules" into rvc-dev am: ↵Jooyung Han
eeb32b3605 am: 8433bb7639 Change-Id: I9cab0c1c6b33a7315006cf4ad2eca884317d954d