LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,579 Commits 2 Branches 0 Tags
9c7451b0f0d58df4699a9199e5974af49d760282
Commit Graph

9579 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
9c7451b0f0 Merge "Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92 am: 40384fb927" into rvc-d1-dev-plus-aosp 2020-04-08 10:17:33 +00:00
TreeHugger Robot
d5f2fde57d Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92 am: 082a9f45bf 
Change-Id: I7ce37a993d3a8b7639ea0444ccd32af68f6b045b
 2020-04-08 10:17:25 +00:00
TreeHugger Robot
a32ef981e4 Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92 am: 40384fb927 
Change-Id: Ia40c524903c7e66f26985f81f1aeafc291d9f5fd
 2020-04-08 10:17:25 +00:00
TreeHugger Robot
40384fb927 Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92 
Change-Id: Ie40d640964879d29cb62bcee2445e5bbefca508b
 2020-04-08 10:00:02 +00:00
TreeHugger Robot
082a9f45bf Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92 
Change-Id: Ib40ba2aeb8ed06e4d91a74cf8261af0f5eac2a66
 2020-04-08 09:59:54 +00:00
Automerger Merge Worker
4989b94612 Merge "[automerger skipped] Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 37fbb256e8 am: 24692c2351 -s ours" into rvc-d1-dev-plus-aosp 2020-04-08 08:11:56 +00:00
Lucas Lin
b2cb0b96ee [automerger skipped] Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 37fbb256e8 am: 24692c2351 -s ours 
am skip reason: Change-Id I90c7a8c47710ea4ad8e8d2682c10440fd7f82270 with SHA-1 3df2ebcb83 is in history

Change-Id: Ib543118f2dba2bd2960dbcb47e762ab16d3c3c10
 2020-04-08 08:11:53 +00:00
Lucas Lin
21ca500db2 [automerger skipped] Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 37fbb256e8 -s ours am: fed9c0d848 -s ours 
am skip reason: Change-Id I90c7a8c47710ea4ad8e8d2682c10440fd7f82270 with SHA-1 3df2ebcb83 is in history

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

Change-Id: Iee0d435b8e41e3d99de864e481d97eed0fec5539
 2020-04-08 07:53:59 +00:00
Lucas Lin
24692c2351 Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 37fbb256e8 
Change-Id: Iffc785851bd1f84d54ef067ef8e555ba57587b2c
 2020-04-08 07:53:43 +00:00
Lucas Lin
37fbb256e8 Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev 2020-04-08 07:40:30 +00:00
lucaslin
c12fcce03c 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
9693c57752 [automerger skipped] Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev am: 69784419af am: 4d73db7f19 -s ours 
am skip reason: Change-Id Ibf2f8118c459a8d7a0992deca8f0f339ccd1bcea with SHA-1 7ab8d925bf is in history

Change-Id: Ie821930a73bb513ff59fb1dde962caff5e36d779
 2020-04-08 06:07:03 +00:00
Junyu Lai
667cd0be15 [automerger skipped] Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev am: 69784419af -s ours am: b9bf8efde6 -s ours 
am skip reason: Change-Id Ibf2f8118c459a8d7a0992deca8f0f339ccd1bcea with SHA-1 ff97691273 is in history

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

Change-Id: I444aaab0fefdce73e31458da213d1e4a7ed2b95c
 2020-04-08 06:00:09 +00:00
Junyu Lai
4d73db7f19 Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev am: 69784419af 
Change-Id: I7bc25a66b6d1c50c29ea7810d0ec02f6c783e0b6
 2020-04-08 05:56:49 +00:00
Junyu Lai
69784419af Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev 2020-04-08 05:55:57 +00:00
Chalard Jean
dbc4a88dcb [automerger skipped] Merge "Add trivial dependencies tests for the network stack" into rvc-dev am: 976f35b0fe -s ours am: 4d07c3951a -s ours 
am skip reason: Change-Id Ie3c15ed25ef3088d3b9b650ffc7f34f49efa6b81 with SHA-1 77c7660522 is in history

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

Change-Id: I55ddfc307214b110c223d91b3cc0cdd601d0aca1
 2020-04-08 04:49:40 +00:00
Chalard Jean
804ecccbdc 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
4d07c3951a [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 77c7660522 is in history

Change-Id: I08107ba6c907bae11c1f304d82cde94d7ce2e306
 2020-04-08 04:37:22 +00:00
Junyu Lai
7ab8d925bf 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
d47f47e05d Merge "Fix NetworkStatsApiTest failed on Q device" am: b0104c84f8 am: 5bc64c9683 am: ef0725dbb3 
Change-Id: Ibac7b46edb13a05c825dd34ffd9c7626c33019f2
 2020-04-07 11:33:47 +00:00
Junyu Lai
ef0725dbb3 Merge "Fix NetworkStatsApiTest failed on Q device" am: b0104c84f8 am: 5bc64c9683 
Change-Id: Ie10c2bb91fabe8289c649333c215ab6dc22f18ff
 2020-04-07 11:19:54 +00:00
Junyu Lai
5bc64c9683 Merge "Fix NetworkStatsApiTest failed on Q device" am: b0104c84f8 
Change-Id: I3657e473a5c8ba45da7f1845ce860c0a494878f7
 2020-04-07 11:04:39 +00:00
Junyu Lai
b0104c84f8 Merge "Fix NetworkStatsApiTest failed on Q device" 2020-04-07 10:49:19 +00:00
Treehugger Robot
4aae1e23cf 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
Chalard Jean
461ef867f6 [automerger skipped] Merge "Fix a stupid NPE" into rvc-dev am: 18eb7e5570 -s ours am: a29050fdf8 -s ours 
am skip reason: Change-Id I3e17211c03bc74426bf5e2e414ec322d73b0060b with SHA-1 380318053b is in history

Change-Id: Icab560cf608837222727b6176155d96498838870
 2020-04-07 09:56:20 +00:00
Chalard Jean
918cecc999 [automerger skipped] Merge "Fix a stupid NPE" into rvc-dev am: 18eb7e5570 am: 8433247d74 -s ours 
am skip reason: Change-Id I3e17211c03bc74426bf5e2e414ec322d73b0060b with SHA-1 380318053b is in history

Change-Id: I2fcb07147f02fd51c2ae145c9278930b439b71c9
 2020-04-07 09:56:05 +00:00
Chalard Jean
8433247d74 Merge "Fix a stupid NPE" into rvc-dev am: 18eb7e5570 
Change-Id: I174ea95f65bce63043fb3fbe9f4d5a0839ae566e
 2020-04-07 09:35:22 +00:00
Chalard Jean
a29050fdf8 [automerger skipped] Merge "Fix a stupid NPE" into rvc-dev am: 18eb7e5570 -s ours 
am skip reason: Change-Id I3e17211c03bc74426bf5e2e414ec322d73b0060b with SHA-1 380318053b is in history

Change-Id: I041a05e6f01033bb559628ae8b18f169e551c3fd
 2020-04-07 09:34:26 +00:00
Treehugger Robot
1db026d821 Merge "Add trivial dependencies tests for the network stack" am: 7621ca16a3 am: f742c99f57 am: 120d4606c5 
Change-Id: Id17b2dbc60daf0328ce6fe0dd78920ca09285ce7
 2020-04-07 09:18:09 +00:00
Treehugger Robot
120d4606c5 Merge "Add trivial dependencies tests for the network stack" am: 7621ca16a3 am: f742c99f57 
Change-Id: I081907a334d98bf4b793d714b82133ed217bb969
 2020-04-07 09:13:01 +00:00
Treehugger Robot
f742c99f57 Merge "Add trivial dependencies tests for the network stack" am: 7621ca16a3 
Change-Id: I940782a1ae97759085a4a6f67c0358e6bfdbd328
 2020-04-07 08:55:37 +00:00
Treehugger Robot
7621ca16a3 Merge "Add trivial dependencies tests for the network stack" 2020-04-07 08:34:44 +00:00
Treehugger Robot
50756739b5 Fix a stupid NPE 
Okay so this is really not a behavior change as it converts an
NPE into an illegal argument exception, but still, that's what
should happen (and that's what the upcoming test actually tests
for).

Test: upcoming NetworkAgentTest
Bug: 139268426
Change-Id: I0d9b8cb8f8dcb587b9430b486b863efb9e9e77ef
Merged-In: I3e17211c03bc74426bf5e2e414ec322d73b0060b
(cherry picked from commit 827d7ceea1e83cca9ba3f6189e20b6780c0194ed, aosp/1277595)
 2020-04-07 07:29:10 +00:00
Lucas Lin
9a146fc3b0 Merge "Add more tests in NetworkCapabilitiesTest.java" am: ba3f22eaa6 am: cedaa78ac2 am: 610c0a6f4a 
Change-Id: Ice4f8e2383586c9f68209028d7c3cd281f39f3a5
 2020-04-07 07:27:03 +00:00
Lucas Lin
610c0a6f4a Merge "Add more tests in NetworkCapabilitiesTest.java" am: ba3f22eaa6 am: cedaa78ac2 
Change-Id: If955360da1fb75e174a4ecfff46988f65db17c8a
 2020-04-07 07:14:28 +00:00
junyulai
ff97691273 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
Lucas Lin
cedaa78ac2 Merge "Add more tests in NetworkCapabilitiesTest.java" am: ba3f22eaa6 
Change-Id: Ie50a0e4e332dd16c7300efb488f4ac4f25c3b6c9
 2020-04-07 06:59:14 +00:00
Lucas Lin
ba3f22eaa6 Merge "Add more tests in NetworkCapabilitiesTest.java" 2020-04-07 06:45:09 +00:00
Treehugger Robot
f79c33a9fb Merge "Fix a stupid NPE" am: 16f4882784 am: b3f7f04518 am: 57e2a625f5 
Change-Id: Ib5fa0c4ae1c73094bbe08468170c96d4dc0692a5
 2020-04-07 06:32:14 +00:00
Treehugger Robot
57e2a625f5 Merge "Fix a stupid NPE" am: 16f4882784 am: b3f7f04518 
Change-Id: I68e5702008a82d93c634fd45c2bd83a33fdf0cd2
 2020-04-07 06:18:28 +00:00
Treehugger Robot
b3f7f04518 Merge "Fix a stupid NPE" am: 16f4882784 
Change-Id: I3a167339e4007e5cb16488e701b9ca16937da265
 2020-04-07 06:02:50 +00:00
Treehugger Robot
16f4882784 Merge "Fix a stupid NPE" 2020-04-07 05:53:10 +00:00
Chalard Jean
77c7660522 Add trivial dependencies tests for the network stack 
Test: this
Bug: 153033018
Change-Id: Ie3c15ed25ef3088d3b9b650ffc7f34f49efa6b81
 2020-04-07 14:42:00 +09:00
lucaslin
3df2ebcb83 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
Automerger Merge Worker
4a5cfee38a Merge "[automerger skipped] Merge "Refactor the Nat464Xlat function for simplicity." into rvc-dev am: 3661ab430b -s ours am: f639a6d666 -s ours" into rvc-d1-dev-plus-aosp 2020-04-07 02:37:33 +00:00
Lorenzo Colitti
3a75ab7430 [automerger skipped] Merge "Refactor the Nat464Xlat function for simplicity." into rvc-dev am: 3661ab430b -s ours am: f639a6d666 -s ours 
am skip reason: Change-Id Ice536bcb269cc8b040c6e7a72c15d0bc8b5bd235 with SHA-1 0d6e50a29d is in history

Change-Id: I67f2aa65a97322ae21c0d97cba2bafaf4ff32aae
 2020-04-07 02:37:28 +00:00