Commit Graph

9673 Commits

Author SHA1 Message Date
Treehugger Robot
8d2ccfc1dc Merge "Fix a theoretical NPE" am: 6334d49d44 am: 92c8e43252 am: c53b4498be am: 0e51f38933
Change-Id: Ia0944c7e7b3a2fd88e5e234d30e21e999e3fa1d4
2020-04-10 18:55:08 +00:00
Treehugger Robot
0e51f38933 Merge "Fix a theoretical NPE" am: 6334d49d44 am: 92c8e43252 am: c53b4498be
Change-Id: Ief314b04963c0ddaf027823a21ee70e84870a94a
2020-04-10 18:06:28 +00:00
Treehugger Robot
c53b4498be Merge "Fix a theoretical NPE" am: 6334d49d44 am: 92c8e43252
Change-Id: Ibf814e81ca984b47b9be1e423e2cde908cf7f193
2020-04-10 17:08:04 +00:00
Treehugger Robot
92c8e43252 Merge "Fix a theoretical NPE" am: 6334d49d44
Change-Id: Idf4cb0acbfb9bc8fef43d42be477778e8ec2fc09
2020-04-10 16:44:25 +00:00
Treehugger Robot
6334d49d44 Merge "Fix a theoretical NPE" 2020-04-10 16:25:07 +00:00
Chalard Jean
5d8bc4b1ac Fix a theoretical NPE
Test: NetworkAgentTests
Bug: 153718627
Change-Id: I08f57cce0cd85d5cd66e9a0ef948224290e9200e
2020-04-10 23:08:00 +09:00
Lucas Lin
c61672e5ef [automerger skipped] Merge "Set WifiAwareNetworkInfo into setTransportInfo()" am: 6056ec00bf am: 6b21fc4608 -s ours am: 5eeba5f485 -s ours am: c3533010fd -s ours
am skip reason: Change-Id Ibbe1cd126d6538003fbb1e5e85892bfb15a920e8 with SHA-1 75f688be48 is in history

Change-Id: I372c705abd5ce3bb1dd99f1a64804607790a2581
2020-04-09 03:35:13 +00:00
Lucas Lin
c3533010fd [automerger skipped] Merge "Set WifiAwareNetworkInfo into setTransportInfo()" am: 6056ec00bf am: 6b21fc4608 -s ours am: 5eeba5f485 -s ours
am skip reason: Change-Id Ibbe1cd126d6538003fbb1e5e85892bfb15a920e8 with SHA-1 75f688be48 is in history

Change-Id: I4e1d4eef651001c873c504cba74619a7864b8f2f
2020-04-09 03:25:40 +00:00
Lucas Lin
5eeba5f485 [automerger skipped] Merge "Set WifiAwareNetworkInfo into setTransportInfo()" am: 6056ec00bf am: 6b21fc4608 -s ours
am skip reason: Change-Id Ibbe1cd126d6538003fbb1e5e85892bfb15a920e8 with SHA-1 75f688be48 is in history

Change-Id: Icc020d872394b2bce4983b55a9fae96cff919c98
2020-04-09 03:12:50 +00:00
Lucas Lin
6b21fc4608 Merge "Set WifiAwareNetworkInfo into setTransportInfo()" am: 6056ec00bf
Change-Id: Ib99da397256138cb16ce7873df50996e1fe8be1a
2020-04-09 02:53:46 +00:00
Automerger Merge Worker
8ea6ed93ba Merge "Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92 am: bc0ff3efe7" into rvc-d1-dev-plus-aosp am: 3eaeb2d109
Change-Id: I994d8dafb0ed29924bc9975211c110e04b0901e1
2020-04-08 10:35:25 +00:00
TreeHugger Robot
2e6d726dda Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92 am: 5e896db967 am: 7c93981e5d
Change-Id: I097956b80619ca8f16d1717f0d3e4496777a8afd
2020-04-08 10:35:11 +00:00
Automerger Merge Worker
3eaeb2d109 Merge "Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92 am: bc0ff3efe7" into rvc-d1-dev-plus-aosp 2020-04-08 10:17:33 +00:00
TreeHugger Robot
7c93981e5d Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92 am: 5e896db967
Change-Id: I7ce37a993d3a8b7639ea0444ccd32af68f6b045b
2020-04-08 10:17:25 +00:00
TreeHugger Robot
a500426b70 Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92 am: bc0ff3efe7
Change-Id: Ia40c524903c7e66f26985f81f1aeafc291d9f5fd
2020-04-08 10:17:25 +00:00
lucaslin
15586a5bae Set WifiAwareNetworkInfo into setTransportInfo()
Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest CtsNetTestCasesLatestSdk:NetworkCapabilitiesTest
Change-Id: Ibbe1cd126d6538003fbb1e5e85892bfb15a920e8
Merged-In: Ibbe1cd126d6538003fbb1e5e85892bfb15a920e8
2020-04-08 10:09:16 +00:00
TreeHugger Robot
bc0ff3efe7 Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92
Change-Id: Ie40d640964879d29cb62bcee2445e5bbefca508b
2020-04-08 10:00:02 +00:00
TreeHugger Robot
5e896db967 Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92
Change-Id: Ib40ba2aeb8ed06e4d91a74cf8261af0f5eac2a66
2020-04-08 09:59:54 +00:00
Automerger Merge Worker
62ae466a7c Merge "[automerger skipped] Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 1f4713bd4f am: 62b8f38312 -s ours" into rvc-d1-dev-plus-aosp am: 8f44b722ff -s ours
am skip reason: Change-Id I90c7a8c47710ea4ad8e8d2682c10440fd7f82270 with SHA-1 e408eb55dc is in history

Change-Id: I053eb039dade1f30148feaec8a10eca52a26424b
2020-04-08 08:29:39 +00:00
Lucas Lin
80180156fe [automerger skipped] Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 1f4713bd4f -s ours am: f3d9033a9e -s ours am: f988f41260 -s ours
am skip reason: Change-Id I90c7a8c47710ea4ad8e8d2682c10440fd7f82270 with SHA-1 e408eb55dc is in history

Change-Id: Ie65f3f0ed36266df21a59b6a4899f6553893502d
2020-04-08 08:28:50 +00:00
Automerger Merge Worker
8f44b722ff Merge "[automerger skipped] Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 1f4713bd4f am: 62b8f38312 -s ours" into rvc-d1-dev-plus-aosp 2020-04-08 08:11:56 +00:00
Lucas Lin
165ddef185 [automerger skipped] Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 1f4713bd4f am: 62b8f38312 -s ours
am skip reason: Change-Id I90c7a8c47710ea4ad8e8d2682c10440fd7f82270 with SHA-1 e408eb55dc is in history

Change-Id: Ib543118f2dba2bd2960dbcb47e762ab16d3c3c10
2020-04-08 08:11:53 +00:00
Lucas Lin
f988f41260 [automerger skipped] Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 1f4713bd4f -s ours am: f3d9033a9e -s ours
am skip reason: Change-Id I90c7a8c47710ea4ad8e8d2682c10440fd7f82270 with SHA-1 e408eb55dc is in history

Change-Id: I3367950e4212e7539bce1f25b68830d7ffc04bab
2020-04-08 08:11:48 +00:00
lucaslin
75f688be48 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
f3d9033a9e [automerger skipped] Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 1f4713bd4f -s ours
am skip reason: Change-Id I90c7a8c47710ea4ad8e8d2682c10440fd7f82270 with SHA-1 e408eb55dc is in history

Change-Id: Iee0d435b8e41e3d99de864e481d97eed0fec5539
2020-04-08 07:53:59 +00:00
Lucas Lin
62b8f38312 Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 1f4713bd4f
Change-Id: Iffc785851bd1f84d54ef067ef8e555ba57587b2c
2020-04-08 07:53:43 +00:00
Lucas Lin
1f4713bd4f Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev 2020-04-08 07:40:30 +00:00
lucaslin
7bc3c6f517 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
00b177833f [automerger skipped] Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev am: dd8bbd4996 am: 306f1d6506 -s ours am: fca9a2e500 -s ours
am skip reason: Change-Id Ibf2f8118c459a8d7a0992deca8f0f339ccd1bcea with SHA-1 7192912f3e is in history

Change-Id: I51d04711e65cfec76d810114b597e7d4ebdd8513
2020-04-08 06:08:06 +00:00
Junyu Lai
4580583376 [automerger skipped] Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev am: dd8bbd4996 -s ours am: d8e86b04d8 -s ours am: 370b580332 -s ours
am skip reason: Change-Id Ibf2f8118c459a8d7a0992deca8f0f339ccd1bcea with SHA-1 3bf1224afc is in history

Change-Id: Ibdfe6c78c30026ffbb3133e0f1e1653dc0372700
2020-04-08 06:07:47 +00:00
Junyu Lai
fca9a2e500 [automerger skipped] Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev am: dd8bbd4996 am: 306f1d6506 -s ours
am skip reason: Change-Id Ibf2f8118c459a8d7a0992deca8f0f339ccd1bcea with SHA-1 7192912f3e is in history

Change-Id: Ie821930a73bb513ff59fb1dde962caff5e36d779
2020-04-08 06:07:03 +00:00
Junyu Lai
370b580332 [automerger skipped] Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev am: dd8bbd4996 -s ours am: d8e86b04d8 -s ours
am skip reason: Change-Id Ibf2f8118c459a8d7a0992deca8f0f339ccd1bcea with SHA-1 3bf1224afc is in history

Change-Id: I534109a6b808a76ae354627f56dfa5461440faa6
2020-04-08 06:06:40 +00:00
Junyu Lai
d8e86b04d8 [automerger skipped] Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev am: dd8bbd4996 -s ours
am skip reason: Change-Id Ibf2f8118c459a8d7a0992deca8f0f339ccd1bcea with SHA-1 3bf1224afc is in history

Change-Id: I444aaab0fefdce73e31458da213d1e4a7ed2b95c
2020-04-08 06:00:09 +00:00
Junyu Lai
306f1d6506 Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev am: dd8bbd4996
Change-Id: I7bc25a66b6d1c50c29ea7810d0ec02f6c783e0b6
2020-04-08 05:56:49 +00:00
Junyu Lai
dd8bbd4996 Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev 2020-04-08 05:55:57 +00:00
Automerger Merge Worker
c69a088e09 Merge "[automerger skipped] Merge "Add trivial dependencies tests for the network stack" into rvc-dev am: 976f35b0fe -s ours am: de3a42dd7a -s ours" into rvc-d1-dev-plus-aosp am: 1c52bbae45 -s ours
am skip reason: Change-Id Ie3c15ed25ef3088d3b9b650ffc7f34f49efa6b81 with SHA-1 dcb74c71db is in history

Change-Id: Ifc4b66e5458c7714b2d5f238ece2ac8b6b10569b
2020-04-08 05:04:17 +00:00
Chalard Jean
93aeed56c3 [automerger skipped] Merge "Add trivial dependencies tests for the network stack" into rvc-dev am: 976f35b0fe am: d2949a4c5c -s ours am: 86dd26b505 -s ours
am skip reason: Change-Id Ie3c15ed25ef3088d3b9b650ffc7f34f49efa6b81 with SHA-1 dcb74c71db is in history

Change-Id: I61a8f2c4c5d15fce1118c3b5898fc49fb70d2669
2020-04-08 05:03:36 +00:00
Chalard Jean
6affb29437 [automerger skipped] Merge "Add trivial dependencies tests for the network stack" into rvc-dev am: 976f35b0fe -s ours am: de3a42dd7a -s ours
am skip reason: Change-Id Ie3c15ed25ef3088d3b9b650ffc7f34f49efa6b81 with SHA-1 dcb74c71db is in history

Change-Id: Ia94c32fbc0e2aee1fd8d860b0ffc7068a5deb94d
2020-04-08 04:49:55 +00:00
Chalard Jean
86dd26b505 [automerger skipped] Merge "Add trivial dependencies tests for the network stack" into rvc-dev am: 976f35b0fe am: d2949a4c5c -s ours
am skip reason: Change-Id Ie3c15ed25ef3088d3b9b650ffc7f34f49efa6b81 with SHA-1 dcb74c71db is in history

Change-Id: I55ddfc307214b110c223d91b3cc0cdd601d0aca1
2020-04-08 04:49:40 +00:00
Chalard Jean
d2949a4c5c Merge "Add trivial dependencies tests for the network stack" into rvc-dev am: 976f35b0fe
Change-Id: I24ed3891a893bf5cc6cc16b3210b2e4264008ce7
2020-04-08 04:37:32 +00:00
Chalard Jean
de3a42dd7a [automerger skipped] Merge "Add trivial dependencies tests for the network stack" into rvc-dev am: 976f35b0fe -s ours
am skip reason: Change-Id Ie3c15ed25ef3088d3b9b650ffc7f34f49efa6b81 with SHA-1 dcb74c71db is in history

Change-Id: I08107ba6c907bae11c1f304d82cde94d7ce2e306
2020-04-08 04:37:22 +00:00
Junyu Lai
7192912f3e 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 ae023a8bbd3a7482fd66547d58759c88e100f207)
2020-04-08 03:13:10 +00:00
Junyu Lai
d6f09333fb Merge "Fix NetworkStatsApiTest failed on Q device" am: cd7c6cb6ca am: e1d7d536e3 am: a7ae7a7d06 am: de432097f0
Change-Id: I7b01321ba340000a9629aa5db825b50ec98365b8
2020-04-07 11:47:08 +00:00
Junyu Lai
de432097f0 Merge "Fix NetworkStatsApiTest failed on Q device" am: cd7c6cb6ca am: e1d7d536e3 am: a7ae7a7d06
Change-Id: Ibac7b46edb13a05c825dd34ffd9c7626c33019f2
2020-04-07 11:33:47 +00:00
Junyu Lai
a7ae7a7d06 Merge "Fix NetworkStatsApiTest failed on Q device" am: cd7c6cb6ca am: e1d7d536e3
Change-Id: Ie10c2bb91fabe8289c649333c215ab6dc22f18ff
2020-04-07 11:19:54 +00:00
Junyu Lai
e1d7d536e3 Merge "Fix NetworkStatsApiTest failed on Q device" am: cd7c6cb6ca
Change-Id: I3657e473a5c8ba45da7f1845ce860c0a494878f7
2020-04-07 11:04:39 +00:00
Junyu Lai
cd7c6cb6ca Merge "Fix NetworkStatsApiTest failed on Q device" 2020-04-07 10:49:19 +00:00
Chalard Jean
71e8627978 [automerger skipped] Merge "Fix a stupid NPE" into rvc-dev am: 18eb7e5570 -s ours am: fe7e08f6ea -s ours am: 0800017588 -s ours
am skip reason: Change-Id I3e17211c03bc74426bf5e2e414ec322d73b0060b with SHA-1 c7e1877d1c is in history

Change-Id: I3aeb2667c0e09b9d39220efbe7bc188688f9a800
2020-04-07 10:20:51 +00:00
Chalard Jean
bdc29fb104 [automerger skipped] Merge "Fix a stupid NPE" into rvc-dev am: 18eb7e5570 am: 93ef311226 -s ours am: 1f12fbe878 -s ours
am skip reason: Change-Id I3e17211c03bc74426bf5e2e414ec322d73b0060b with SHA-1 c7e1877d1c is in history

Change-Id: Id6e3805ee9a49e9edc2a6a16e60c3f54ade2990a
2020-04-07 10:20:14 +00:00
Treehugger Robot
ff3c00dda0 Add trivial dependencies tests for the network stack
Test: this
Bug: 153033018

Change-Id: I3e66752ebfb5f4324d897210ce26ddaf67f53228
Merged-In: Ie3c15ed25ef3088d3b9b650ffc7f34f49efa6b81
(cherry picked from commit c79353f2e4a99635bcf6eb9177c971f268f71204, aosp/1275998)
2020-04-07 10:09:10 +00:00