Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
510,920 Commits 3 Branches 0 Tags
bdff67ab7349e3c99cf46292d41ea12ff5b9deb3
Commit Graph

8695 Commits

Author SHA1 Message Date
TreeHugger Robot
9d9901b817 Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92 am: 12d74e1e4d am: 51b16432d6 am: 88f6a1b0db 
Change-Id: Ifb05f8217bc25727c5a04dde21191b7798e1dba6
 2020-04-08 10:47:28 +00:00
TreeHugger Robot
51b16432d6 Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92 am: 12d74e1e4d 
Change-Id: I7ce37a993d3a8b7639ea0444ccd32af68f6b045b
 2020-04-08 10:17:25 +00:00
lucaslin
190ce2106f Set WifiAwareNetworkInfo into setTransportInfo() 
Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest CtsNetTestCasesLatestSdk:NetworkCapabilitiesTest
Change-Id: Ibbe1cd126d6538003fbb1e5e85892bfb15a920e8
 2020-04-08 08:11:10 +00:00
Lucas Lin
4406aac0cc Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev 2020-04-08 07:40:30 +00:00
lucaslin
fb4ee18acb Add more tests in NetworkCapabilitiesTest.java 
Test deduceRestrictedCapability(), getAdministratorUids(),
setAdministratorUids(), getNetworkSpecifier(), getOwnerUid(),
setLinkDownstreamBandwidthKbps(), setLinkUpstreamBandwidthKbps(),
setSignalStrength() and Builder().

Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkCapabilitiesTest
Change-Id: I525941c47b71cd61ee872fd4d71b02a5d3767e21
Merged-In: I90c7a8c47710ea4ad8e8d2682c10440fd7f82270
 2020-04-08 07:37:49 +00:00
Junyu Lai
e995acd27e Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev 2020-04-08 05:55:57 +00:00
Junyu Lai
5a50ac984f Fix NetworkStatsApiTest failed on Q device 
Currently, the addEntry method is used in constructor of test,
which is not correct since there is no such method in Q devices.

Thus, initialize of NetworkStats variables outside of constructor.

Test: atest NetworkStatsApiTest
Test: atest CtsNetTestCasesLatestSdk:NetworkStatsApiTest on Q device
Bug: 150644692
Change-Id: Ibf2f8118c459a8d7a0992deca8f0f339ccd1bcea
Merged-In: Ibf2f8118c459a8d7a0992deca8f0f339ccd1bcea
(cherry picked from commit ae023a8bbd)
 2020-04-08 03:13:10 +00:00
Junyu Lai
ae023a8bbd Merge "Fix NetworkStatsApiTest failed on Q device" am: e694c0af58 am: 04b8094bd8 am: 15f8a94cbc am: 8a73f6cf2a am: fbad3807cf 
Change-Id: Id74e9e23bd06de4bca803b4c21b1883caeceab57
 2020-04-07 12:01:32 +00:00
Junyu Lai
15f8a94cbc Merge "Fix NetworkStatsApiTest failed on Q device" am: e694c0af58 am: 04b8094bd8 
Change-Id: Ie10c2bb91fabe8289c649333c215ab6dc22f18ff
 2020-04-07 11:19:54 +00:00
Junyu Lai
e694c0af58 Merge "Fix NetworkStatsApiTest failed on Q device" 2020-04-07 10:49:19 +00:00
Treehugger Robot
37546bb233 Add trivial dependencies tests for the network stack 
Test: this
Bug: 153033018

Change-Id: I3e66752ebfb5f4324d897210ce26ddaf67f53228
Merged-In: Ie3c15ed25ef3088d3b9b650ffc7f34f49efa6b81
(cherry picked from commit c79353f2e4, aosp/1275998)
 2020-04-07 10:09:10 +00:00
Treehugger Robot
c79353f2e4 Merge "Add trivial dependencies tests for the network stack" am: 9a20934af4 am: 92550a9238 am: 82122ea703 am: 6895107016 am: 74c3bd9a41 
Change-Id: Ie34b14334e54af254533e0a7df2aa6ae9dc26510
 2020-04-07 09:56:23 +00:00
Treehugger Robot
82122ea703 Merge "Add trivial dependencies tests for the network stack" am: 9a20934af4 am: 92550a9238 
Change-Id: I081907a334d98bf4b793d714b82133ed217bb969
 2020-04-07 09:13:01 +00:00
Treehugger Robot
9a20934af4 Merge "Add trivial dependencies tests for the network stack" 2020-04-07 08:34:44 +00:00
Lucas Lin
9ba8e28aeb Merge "Add more tests in NetworkCapabilitiesTest.java" am: bc806f782e am: 7b8ad0cfd0 am: 672d8a8c45 am: 25b680e028 am: e8c48525e1 
Change-Id: I394cc33150ef992b8bad75246199ee23fd2947e6
 2020-04-07 07:58:45 +00:00
Lucas Lin
672d8a8c45 Merge "Add more tests in NetworkCapabilitiesTest.java" am: bc806f782e am: 7b8ad0cfd0 
Change-Id: If955360da1fb75e174a4ecfff46988f65db17c8a
 2020-04-07 07:14:28 +00:00
junyulai
821300b5cd Fix NetworkStatsApiTest failed on Q device 
Currently, the addEntry method is used in constructor of test,
which is not correct since there is no such method in Q devices.

Thus, initialize of NetworkStats variables outside of constructor.

Test: atest NetworkStatsApiTest
Test: atest CtsNetTestCasesLatestSdk:NetworkStatsApiTest on Q device
Bug: 150644692
Change-Id: Ibf2f8118c459a8d7a0992deca8f0f339ccd1bcea
 2020-04-07 15:07:16 +08:00
Chalard Jean
443a18a512 Add trivial dependencies tests for the network stack 
Test: this
Bug: 153033018
Change-Id: Ie3c15ed25ef3088d3b9b650ffc7f34f49efa6b81
 2020-04-07 14:42:00 +09:00
lucaslin
cb86457ddb Add more tests in NetworkCapabilitiesTest.java 
Test deduceRestrictedCapability(), getAdministratorUids(),
setAdministratorUids(), getNetworkSpecifier(), getOwnerUid(),
setLinkDownstreamBandwidthKbps(), setLinkUpstreamBandwidthKbps()
and setSignalStrength().

Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkCapabilitiesTest
Change-Id: I90c7a8c47710ea4ad8e8d2682c10440fd7f82270
 2020-04-07 11:58:22 +08:00
TreeHugger Robot
a923d79cc5 Merge "Rename vts-core to vts" into rvc-dev am: e8931d06dd am: 0a3f6eac80 am: 6c0d772e64 am: c955d821d3 
Change-Id: Ie42739ab33295adac3d93858b33a56d0089186f0
 2020-04-07 02:09:44 +00:00
TreeHugger Robot
6c0d772e64 Merge "Rename vts-core to vts" into rvc-dev am: e8931d06dd am: 0a3f6eac80 
Change-Id: I7bcf191e2b09d4c0d3793a7f86afa2f5fc586ff8
 2020-04-07 01:31:00 +00:00
TreeHugger Robot
76d84af910 Merge "Rename vts-core to vts" into rvc-dev am: e8931d06dd 
Change-Id: I494be2016af12aa70b6c98203c8ed348e33fe93f
 2020-04-07 01:19:10 +00:00
TreeHugger Robot
e8931d06dd Merge "Rename vts-core to vts" into rvc-dev 2020-04-07 01:14:42 +00:00
Dan Shi
a1d69738ef Rename vts-core to vts 
Bug: 151896491
Test: presubmit check
Exempt-From-Owner-Approval: This CL renames suite name vts-core to vts.
It won't change test logic or behavior.

Change-Id: I79cddf5e4a65486b8f1286ea430360479ad2b93d
 2020-04-06 16:23:37 -07:00
Jorim Jaggi
387991e2aa Merge "Revert "Revert "Defer updating InsetsSource.mFrame while animating""" into rvc-dev am: a775f45d85 am: 911ce402a4 am: 67658867a1 am: 46756d0fa2 
Change-Id: Ida5cd0ca35bed637a2bc3e5cacc20168efa1d990
 2020-04-06 15:48:46 +00:00
Lorenzo Colitti
06dcc327c6 Rename the *Nat64Prefix to *Nat64PrefixFromDns. 
This just a rename with no functional changes at all. It is
preparation for supporting getting the NAT64 prefix from the
RA.

Bug: 150648313
Test: covered by existing ConnectivityServiceTest and Nat464XlatTest
Merged-In: Ia9a09a708870827b1e4cf068f930fa9542dd116c
Change-Id: Ia9a09a708870827b1e4cf068f930fa9542dd116c
 2020-04-06 15:45:14 +00:00
Jorim Jaggi
67658867a1 Merge "Revert "Revert "Defer updating InsetsSource.mFrame while animating""" into rvc-dev am: a775f45d85 am: 911ce402a4 
Change-Id: I0b775c6756215c19cfcdd3dc587cb967ba4a36c2
 2020-04-06 14:58:10 +00:00
Jorim Jaggi
7d79a47530 Merge "Revert "Revert "Defer updating InsetsSource.mFrame while animating""" into rvc-dev am: a775f45d85 
Change-Id: Ide36c5bbded49bae85fe2f050d4af18458e60584
 2020-04-06 14:41:34 +00:00
Jorim Jaggi
a775f45d85 Merge "Revert "Revert "Defer updating InsetsSource.mFrame while animating""" into rvc-dev 2020-04-06 14:27:16 +00:00
Jorim Jaggi
33a2183d4b Revert "Revert "Defer updating InsetsSource.mFrame while animating"" 
This reverts commit 8c56ac6b94.

Underlying issue has been fixed:

Test: InsetsControllerTest
Bug: 152071027
Change-Id: I2b80de7067bf688a6b36233b9a1e92e2cf31c148
 2020-04-06 14:28:59 +02:00
Lucas Lin
ea6a210cf5 Merge "Add MatchAllNetworkSpecifierTest" into rvc-dev 2020-04-06 09:35:27 +00:00
Junyu Lai
ae9a901cbb Merge changes from topic "am-5ce58db354ac494a84904378ca35c013-rvc-dev" into rvc-dev 
* changes:
  [SP26] add CTS for NetworkStats
  [SP26.2] add a method in NetworkStats that removes empty entries
 2020-04-06 04:15:39 +00:00
Remi NGUYEN VAN
0a558d498b Merge "Fix setAdministratorUids tests on Q" into rvc-dev 2020-04-06 02:22:37 +00:00
Junyu Lai
6ec40a86dd [SP26] add CTS for NetworkStats 
Test: atest NetworkStatsApiTest
Test: atest CtsNetTestCasesLatestSdk:NetworkStatsApiTest on Q device
Bug: 150644692
Change-Id: I690704b43cfd16de70c4c83916f6d750cf613f67
Merged-In: I690704b43cfd16de70c4c83916f6d750cf613f67
(cherry picked from commit 5c670a2714)
 2020-04-06 02:21:17 +00:00
junyulai
dba7d0ae89 [SP26.2] add a method in NetworkStats that removes empty entries 
In current design, entries with zeros are preserved after
addition/subtraction. These entries are not very useful
and lead to difficulty of verifying the result of
addition/subtraction.

However, change the behavior in the original NetworkStats
is considered risky in current stage.

Thus, this change provide a function that could remove these
empty entries in tests.

Test: atest FrameworksNetTests
Bug: 152827872
Bug: 150644692

Change-Id: I40a76935d55712b8083ee1e17e137a8a4ef5e029
Merged-In: I40a76935d55712b8083ee1e17e137a8a4ef5e029
(cherry picked from commit 6c7bef3064)
 2020-04-06 02:18:50 +00:00
TreeHugger Robot
43bc020fc0 Merge "Only apply VPN isolation if it's fully routed" into rvc-dev 2020-04-04 03:44:46 +00:00
JW Wang
2fccceef90 Merge "Skip the test if no mainline modules installed" into rvc-dev am: a167a4774a am: f23d9637aa am: a2d38daef4 am: 8ba106aea8 
Change-Id: I21e0df7325a140731b703b7cebc6303d4302078b
 2020-04-03 15:31:54 +00:00
JW Wang
a2d38daef4 Merge "Skip the test if no mainline modules installed" into rvc-dev am: a167a4774a am: f23d9637aa 
Change-Id: Ie92b35e85a75ee655ab3395f3cb7603ee6418a07
 2020-04-03 14:51:37 +00:00
JW Wang
283c14c7ca Merge "Skip the test if no mainline modules installed" into rvc-dev am: a167a4774a 
Change-Id: I76425c8ac34b510f4ec3b68768361b7a6d64e6dd
 2020-04-03 14:41:12 +00:00
JW Wang
65a7eeee7b Skip the test if no mainline modules installed 
The test failed because we failed to enable rollback for
ModuleMetadataGoogle which is not a module on AOSP builds.

Let's skip the test for builds which have no mainline modules
installed.

Bug: 152721401
Test: atest StagedRollbackTest
Change-Id: Iaf75dea5388e2a751a26f983a79924c4358d4833
 2020-04-03 21:42:55 +08:00
Remi NGUYEN VAN
6eb24ccb03 Merge "Fix setAdministratorUids tests on Q" am: 4c34898a68 am: e8a5c4a223 am: 4a98c371c4 am: c00f264cef am: 34aa4bbb28 
Change-Id: If5b57ee838bd61a15c6fdeeb68e14ffd22064f90
 2020-04-03 09:43:56 +00:00
Remi NGUYEN VAN
07a498b4b2 Fix setAdministratorUids tests on Q 
setAdministratorUids does not exist on Q, so such tests must be skipped
on Q devices.

Bug: 147903575
Test: atest CtsNetTestCasesLatestSdk on Q and AOSP devices
Merged-In: I1b362660de9733bb9f0ede1ed5cf62279bf1c05e
Change-Id: I1b362660de9733bb9f0ede1ed5cf62279bf1c05e
 2020-04-03 09:42:33 +00:00
Remi NGUYEN VAN
4a98c371c4 Merge "Fix setAdministratorUids tests on Q" am: 4c34898a68 am: e8a5c4a223 
Change-Id: Ifbcb485fad3a61c2cf48fb6e264bcdc130119ff0
 2020-04-03 08:41:32 +00:00
Remi NGUYEN VAN
4c34898a68 Merge "Fix setAdministratorUids tests on Q" 2020-04-03 07:54:59 +00:00
Remi NGUYEN VAN
fef4e249e4 Merge "Make LinkPropertiesTest compatible with Q" into rvc-dev 2020-04-03 07:52:26 +00:00
Lorenzo Colitti
d827033450 Merge "Rename the *Nat64Prefix to *Nat64PrefixFromDns." am: 65be95c784 am: 97518a0b84 am: 8097b342ae am: 00723d8d50 am: 0385805403 
Change-Id: I0f6623a5ff918c7d01dcfd6fba076f6559a324fd
 2020-04-02 19:58:27 +00:00
Automerger Merge Worker
0ad9a08a22 Merge "Merge "Only apply VPN isolation if it's fully routed" am: 4fa9742c4d am: 7adae30ac0" into rvc-dev-plus-aosp am: 8eec601b70 am: 84eddfdf5d am: 7da8379f85 
Change-Id: Ie61a241b2b80ea12c60a58c5e26b5af34e02a5ef
 2020-04-02 18:52:50 +00:00
Junyu Lai
5c670a2714 Merge changes from topic "sp26-networkstats-cts" am: 6baf734a9b am: 031a550e7f am: 073aa8ac70 am: b0badec656 am: 5a2fcd904a 
Change-Id: I133100effc8a0f6318b2574f09f3da416e7b5107
 2020-04-02 18:36:31 +00:00
junyulai
6c7bef3064 [SP26.2] add a method in NetworkStats that removes empty entries am: fb16574069 am: 7bb7d94d39 am: 094a459dcf am: 87d385a28e am: 3265830ec9 
Change-Id: I6397ef1dd483d0d2f62cfcf044fa6b89b3c39982
 2020-04-02 18:36:24 +00:00
Lorenzo Colitti
8097b342ae Merge "Rename the *Nat64Prefix to *Nat64PrefixFromDns." am: 65be95c784 am: 97518a0b84 
Change-Id: I9521b1a243f6907b790888c7a1e32991da05cf33
 2020-04-02 15:24:59 +00:00