summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-05-13Merge "Set min_sdk_version to be part of mainline modules" into rvc-dev am: ↵Jooyung Han
eeb32b3605 Change-Id: I9bf5e238573c0bce61ed554db194b6b91da30ae9
2020-05-13Merge "Set min_sdk_version to be part of mainline modules" into rvc-devJooyung Han
2020-05-13Set min_sdk_version to be part of mainline modulesJooyung Han
Modules contributing mainline modules (APK/APEX) should set min_sdk_version as well as apex_available. For now setting min_sdk_version doesn't change build outputs. But build-time checks will be added soon. Exempt-From-Owner-Approval: cp from aosp Bug: 152655956 Test: m Merged-In: Idc4aa437c21ea1add95a709bf709a5dbe662b084 Change-Id: Idc4aa437c21ea1add95a709bf709a5dbe662b084 (cherry picked from commit d3fb9f5bb31766291e7f7e506cfb1a17b4c70d1c)
2020-05-13Add test for NetworkStackService dumpsys versionRemi NGUYEN VAN
The test verifies that each method on INetworkStackConnector updates the version received from the remote, and that the output of dumpsys version matches the expected template. This logic will be changed in R to include interface hashes, so a test is important to verify that Q behavior remains the same to avoid breaking Q conformance tests. Test: atest NetworkStackTests:NetworkStackServiceTest Bug: 137328719 Original-Change: https://android-review.googlesource.com/1293754 Merged-In: Icaab91d2cb4c62930f969612545e369f09f1b0c7 Change-Id: Icaab91d2cb4c62930f969612545e369f09f1b0c7
2020-05-12Merge "Finish mocking in finally clause" into rvc-dev am: 5c5a689847 am: ↵Remi NGUYEN VAN
41650bbc32 Change-Id: Ib8b48034e618408b72e7150283cb2a7e027bedfe
2020-05-12Merge "Finish mocking in finally clause" into rvc-dev am: 5c5a689847Remi NGUYEN VAN
Change-Id: Idd768e7aa4c21501757dbe422d353489710f5e94
2020-05-12Merge "Finish mocking in finally clause" into rvc-devRemi NGUYEN VAN
2020-05-11Test that IFA_F_STABLE_PRIVACY appears in LinkAddresses. am: a90dec3838 am: ↵Lorenzo Colitti
bd967a001d Change-Id: I7a7dc04dbd5c26def8020c378954572a2823495e
2020-05-11Test that IFA_F_STABLE_PRIVACY appears in LinkAddresses. am: a90dec3838Lorenzo Colitti
Change-Id: Ia217f0866968cb99097248684abd74657d63ecc0
2020-05-10Use doIpv6Provisioning in testPref64Option. am: a8a73c5319 am: 449c3af7f1Lorenzo Colitti
Change-Id: I04e7ad59a23fc463a1709926524546d8fe705c6a
2020-05-10Test that IFA_F_STABLE_PRIVACY appears in LinkAddresses.Lorenzo Colitti
Bug: 150644681 Test: test-only change Original-Change: https://android-review.googlesource.com/1295495 Merged-In: I4b7a489ae80d00d57b3c3d6e6ecebdf3bc581fd5 Change-Id: I4b7a489ae80d00d57b3c3d6e6ecebdf3bc581fd5
2020-05-10Use doIpv6Provisioning in testPref64Option. am: a8a73c5319Lorenzo Colitti
Change-Id: I1d01958ae39cf2e0c750bfa583509ce87f7ed90f
2020-05-10Use doIpv6Provisioning in testPref64Option.Lorenzo Colitti
This is a simple refactoring to reduce code duplication, and it shows that it's possible to use doIpv6Provisioning in tests that also need to place their own expectations on LinkProperties around provisioning time. Bug: 152723363 Bug: 153694684 Test: atest NetworkStackNextIntegrationTests:IpClientIntegrationTest#testPref64Option --iterations 100 Change-Id: Iaa3e297e2417d4cdf9393baf27d61657e5743888
2020-05-09[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev ↵TreeHugger Robot
am: 962312ad93 -s ours am: d68f7b3dd1 -s ours am skip reason: subject contains skip directive Change-Id: I4cd69e97603bd82e888950b7179b5240674721e4
2020-05-09[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev ↵TreeHugger Robot
am: 962312ad93 -s ours am skip reason: subject contains skip directive Change-Id: Ic2674b9e7ad8c3d65e76796c9b49a0753635f76f
2020-05-09Merge "Import translations. DO NOT MERGE" into rvc-devTreeHugger Robot
2020-05-09Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Change-Id: I188f779e7992c7d1203c3a3c61ea64f0eb90c5d8
2020-05-09[automerger skipped] Merge "Import translations. DO NOT MERGE" into ↵TreeHugger Robot
rvc-d1-dev am: a9cd2df773 -s ours am skip reason: subject contains skip directive Change-Id: I9a8fe8ffc5899d855cb665909bd0f2709e8b6837
2020-05-09Merge "Import translations. DO NOT MERGE" into rvc-d1-devTreeHugger Robot
2020-05-09[automerger skipped] Import translations. DO NOT MERGE am: 4cf8e2e3ed -s ↵Bill Yi
ours am: 3506656a88 -s ours am skip reason: subject contains skip directive Change-Id: I64233f0f40279046bf344b9dfa4d04d5b37c8e92
2020-05-09[automerger skipped] Import translations. DO NOT MERGE am: 4cf8e2e3ed -s oursBill Yi
am skip reason: subject contains skip directive Change-Id: I7579d9841ad092b3a9858004d8a9f9c1130200fe
2020-05-09Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Change-Id: Ie318fc47e135986c35b2d7371e879b098090f58e
2020-05-09Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Change-Id: Ie5daf38e6ea0cabbbe461bfbc495aab6bdef26b0
2020-05-08Merge "Set clientId when parsing an explicit DHCP_CLIENT_IDENTIFIER option." ↵TreeHugger Robot
into rvc-dev am: f8de4fdcc3 am: ee30356ce2 Change-Id: I70c02e488d88d9d73c4744dcc2a3ea3423a4a9b3
2020-05-08Verify the IP addresses from IPv6-only provisioning look correct. am: ↵Lorenzo Colitti
e6f3ab0eae am: 3006c1c09e Change-Id: Iafe4bc8f9636719ec055bf88e8b55dd8d1eae7fd
2020-05-08Merge "Set clientId when parsing an explicit DHCP_CLIENT_IDENTIFIER option." ↵TreeHugger Robot
into rvc-dev am: f8de4fdcc3 Change-Id: Icee24bcf4587fc538a78416e49338bdbf173b083
2020-05-08Verify the IP addresses from IPv6-only provisioning look correct. am: e6f3ab0eaeLorenzo Colitti
Change-Id: I6c5349cb4c0d711c076efd4a581506ac469ea642
2020-05-08Merge "Set clientId when parsing an explicit DHCP_CLIENT_IDENTIFIER option." ↵TreeHugger Robot
into rvc-dev
2020-05-08Verify the IP addresses from IPv6-only provisioning look correct.Lorenzo Colitti
Currently, the IPv6-only tests in IpClientIntegrationTest check that there are 3 IPv6 addresses, but not what type of addresses they are. Check that one is a link-local address, one is a stable privacy address, and one is a privacy address. Bug: 152723363 Test: test-only change Original-Change: https://android-review.googlesource.com/1295491 Merged-In: I285952a9a1476c694e54b6bc27ec757fd5d8eb50 Change-Id: I285952a9a1476c694e54b6bc27ec757fd5d8eb50
2020-05-08Merge "Update default value of probe url to be a constant" into rvc-dev am: ↵Chiachang Wang
19b2c8a182 am: d154f98463 Change-Id: I07c12d59971510d79856debc4876fcc94736955d
2020-05-08Merge "Prevent using commas in url configurations" into rvc-dev am: ↵Chiachang Wang
6ccbe373e6 am: efddbd1db6 Change-Id: I06068c7e76ad78244831a1ab715987a950af270a
2020-05-08Merge "Update default value of probe url to be a constant" into rvc-dev am: ↵Chiachang Wang
19b2c8a182 Change-Id: Iee6c80357edf3f72bdd0e3c0d6dea007cc0f60bb
2020-05-08Merge "Prevent using commas in url configurations" into rvc-dev am: 6ccbe373e6Chiachang Wang
Change-Id: I78eac09d2b8e424ae111a54d9c6c22a29ded649d
2020-05-08Merge "Update default value of probe url to be a constant" into rvc-devChiachang Wang
2020-05-08Merge "Prevent using commas in url configurations" into rvc-devChiachang Wang
2020-05-08Finish mocking in finally clauseTreehugger Robot
Failure of testIpClientServiceAvailableAfterPolling could cause tests in the same process to fail because the mockito session is not finalized. Use try / finally to make sure finishMocking is called. Test: atest ModuleNetworkStackClientTest Bug: 139314310 Original-Change: https://android-review.googlesource.com/1299389 Merged-In: I95cc24e789c5af5f655c875314ed97f50121166c Change-Id: I95cc24e789c5af5f655c875314ed97f50121166c
2020-05-07Merge "Set jni_uses_sdk_apis for NetworkStackTests" into rvc-dev am: ↵Colin Cross
6421197f47 am: 2a05f9a5dd Change-Id: Id1a935344ad2824a280303b2e6c31d8b6328c00b
2020-05-07Merge "Set jni_uses_sdk_apis for NetworkStackTests" into rvc-dev am: 6421197f47Colin Cross
Change-Id: I711d80317c2ccc620d80938aaf81107a1718be1a
2020-05-07Merge "Set jni_uses_sdk_apis for NetworkStackTests" into rvc-devColin Cross
2020-05-07Merge "Fix the potential NPE when starting provisioning with FILS." into ↵Xiao Ma
rvc-dev am: db6652aaef am: 553ee0cfce Change-Id: I60c910fa94451c46f4507d9cc99994b9b6123b0d
2020-05-07Merge "Fix the potential NPE when starting provisioning with FILS." into ↵Xiao Ma
rvc-dev am: db6652aaef Change-Id: I001b378de6982971dee3819b3ec6d9f185cce5e9
2020-05-07Merge "Use stable networkstack-aidl-interfaces" into rvc-dev am: 88384a2c38 ↵TreeHugger Robot
am: 00fc40b6e8 Change-Id: I091fc6bb6593837f904e228cc7af61ea93222349
2020-05-07Merge "Fix the potential NPE when starting provisioning with FILS." into rvc-devXiao Ma
2020-05-07Merge "Use stable networkstack-aidl-interfaces" into rvc-dev am: 88384a2c38TreeHugger Robot
Change-Id: Iade76d7a5a8d9b4c2aaca84e14f3a4bd6dea52db
2020-05-07Merge "Use stable networkstack-aidl-interfaces" into rvc-devTreeHugger Robot
2020-05-07Merge "Test that the system doesn't accept non-/96 NAT64 prefixes." into ↵Lorenzo Colitti
rvc-dev am: 055652bf53 am: 01cc8ed157 Change-Id: I8e3e26479da52a011d85867c8a1aa5b8e2f4f81c
2020-05-07Merge "Test that the system doesn't accept non-/96 NAT64 prefixes." into ↵Lorenzo Colitti
rvc-dev am: 055652bf53 Change-Id: I5e46dba502e1a3b167080fe88b6e7785e8c64f63
2020-05-07Merge "Test that the system doesn't accept non-/96 NAT64 prefixes." into rvc-devLorenzo Colitti
2020-05-07Fix the potential NPE when starting provisioning with FILS.Xiao Ma
Starting provisioning with enabled FILS is unlike the normal case that always happens after L2 connection has been established, at this point we already know the current bssid. However, for FILS connection, the current bssid is still null when starting prov. Bug: 155696520 Test: atest NetworkStackTests NetworkStackIntegrationTests Merged-In: I3c29c6ad95c23cea2b3f374fb9dc35a8f54a6427 Change-Id: I3c29c6ad95c23cea2b3f374fb9dc35a8f54a6427
2020-05-07Set clientId when parsing an explicit DHCP_CLIENT_IDENTIFIER option.Xiao Ma
Bug: 130741856 Test: atest NetworkStackTests TetheringTests Test: manually turn on the hotspot and verify the downstream device can attach to the upstream hotspot, then turn it off, repeat multiple times. Merged-In: I9da5fec47a74de36869e795fa9b1d7170d2f91c9 Change-Id: I9da5fec47a74de36869e795fa9b1d7170d2f91c9