Lucas Lin
85d77edcbd
Merge "Remove NETWORK_STACK_UID check" am: 5f7eb9024e am: f23bda53b2 am: cb2db75d6f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635323
Change-Id: Icade0541f309622e39c9b02d86fbb6822c378fb1
2021-03-17 16:06:56 +00:00
Lucas Lin
51121bf08f
Merge "Add comments to describe the value of converting hex to decimal" am: 26f778d2bd am: dc6444c414 am: 8885169a2e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635221
Change-Id: I0f978fd5fa0283a40db2897478483d680d44e9e9
2021-03-17 16:05:47 +00:00
Lucas Lin
bb98a5bb42
[automerger skipped] Merge "Have a new API to get private DNS mode" am: 11a286c9b5 am: eafa4097bd am: 9ecf4d330b -s ours
...
am skip reason: skip tag Change-Id I02a1e91b4eafb5f5df3eada1c07b99849a050c3c with SHA-1 50205afdd8 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620860
Change-Id: I45f348a3d0105f07441c8aabc226a12ee6a9e89c
2021-03-17 16:05:23 +00:00
Chalard Jean
1cda30b0a2
Merge "[NS01] Add NetworkScore" am: 98de10a7a1 am: 18294fcbb3 am: a73e64726f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556099
Change-Id: I953a773f8914152578a98d71b43d0a2e30a51aba
2021-03-17 16:04:22 +00:00
Remi NGUYEN VAN
5a66dd85b2
Merge "Add ParseException constructors to API" am: ef7b38b334 am: 2299e83d12 am: 40078d1567
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635044
Change-Id: I4e4b1f4a70fcfaa43fa9b612e7fbd151093fd8fe
2021-03-17 16:03:23 +00:00
Remi NGUYEN VAN
35a32733e9
[automerger skipped] Merge "Create ServiceConnectivityResources" am: eb46aa1c58 am: 4df498eb9a am: 19e5014a61 -s ours
...
am skip reason: skip tag Change-Id I77ac6f4303c54acc96f16e18ef02add30298ff3d with SHA-1 0c8f517e50 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620871
Change-Id: I95598f3c3fae16b5d2ec5dd314530649aee5e9b6
2021-03-17 16:02:18 +00:00
TreeHugger Robot
b99427e21f
[automerger skipped] Merge changes I6ec246a6,If7eb8857,Id3d12b23,Ia52f9caf,I21028457, ... into rvc-dev am: 65eb4a4332 am: f80adf07e2 -s ours
...
am skip reason: skip tag Change-Id I6ec246a6a4e61f634956a165797fbb80296efd6a with SHA-1 8eef233b19 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425320
Change-Id: I0d9e8484e30a9cc730897841779b454a86a4ca52
2021-03-17 09:41:45 +00:00
Lorenzo Colitti
fb86cc877f
[automerger skipped] Backport test coverage from aosp/1547496. am: ee5ed04cbf am: ee04333c71 -s ours
...
am skip reason: skip tag Change-Id Ibf376a6fa4b34d1c96f8506fa8abbb7595a8c272 with SHA-1 c284b4b8dd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425319
Change-Id: Id9d9f9db4bbed35bea8599a33a94c4248463364c
2021-03-17 09:41:36 +00:00
Lorenzo Colitti
18ec4b5fa9
[automerger skipped] Backport some helpers in ConnectivityServiceTest. am: 853504c524 am: 646fa39db0 -s ours
...
am skip reason: skip tag Change-Id I827543751dbf5e626a24ec02cd6f50b423f5f761 with SHA-1 bb6b62a41e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425318
Change-Id: Ia26d7b281695355b9d96a4689fa6edd28b9355b0
2021-03-17 09:41:26 +00:00
Lorenzo Colitti
a852b0d7b2
[automerger skipped] Test for bugs with suspended VPN underlying networks. am: 157af6c6d3 am: 402c1815e7 -s ours
...
am skip reason: skip tag Change-Id Ia52f9cafef3f49ae70ad135d017e207eb57fddfe with SHA-1 973da4644d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425317
Change-Id: Id04bcd50ea4c343e014de1babee8b5e71f18f422
2021-03-17 09:41:17 +00:00
Lorenzo Colitti
9534bbca83
[automerger skipped] Add a test for getDefaultNetworkCapabilitiesForUser. am: 6f7a5df35a am: fee813bd91 -s ours
...
am skip reason: skip tag Change-Id I210284578e38cd25b8b95235d3390d5bd66a5a70 with SHA-1 8f35ad5871 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425316
Change-Id: If447c6692f3fd150aa67c1db98560995e3335294
2021-03-17 09:41:04 +00:00
Lorenzo Colitti
3ae81330cc
[automerger skipped] Improve testing of CONNECTIVITY_ACTION broadcasts. am: 69a61d921b am: 179f9147a6 -s ours
...
am skip reason: skip tag Change-Id Ibada8b4215625e1016d9fd170526206920af76f5 with SHA-1 07fc61c954 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425315
Change-Id: Ic26cfc92ad7e9a600ee22060f78a5a29a37ede52
2021-03-17 09:40:54 +00:00
Lorenzo Colitti
b11d075b31
[automerger skipped] Test passing an underlying network array with null network in it. am: b85a606d49 am: 357f4e82cd -s ours
...
am skip reason: skip tag Change-Id Id4632e1b004c09910b4b7613f7233d2c19e2f0ac with SHA-1 e2d336afcc is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425314
Change-Id: If8e2cbbde74be7a8424da2b14af3d2948231bd0b
2021-03-17 09:40:44 +00:00
Lorenzo Colitti
83a7e8e31c
[automerger skipped] Make testVpnNetworkActive more deterministic. am: abc306b5e9 am: 75657895d9 -s ours
...
am skip reason: skip tag Change-Id I319858228e8d097c0b60a107029f296385f91269 with SHA-1 834f32089f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425313
Change-Id: Ie0c2945a894d0fb39ae5499d1b55293c604a7ca5
2021-03-17 09:40:34 +00:00
Lorenzo Colitti
0e9a9516b6
[automerger skipped] Make MockVpn more realistic and easier to use. am: 02e6be7824 am: 753242551f -s ours
...
am skip reason: skip tag Change-Id I749ff325bc13ac96f512270b86d1f67686eec378 with SHA-1 6d8b1d2846 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425312
Change-Id: Ie847fa29d101d3c248c091bbeab6b1d30178a2d5
2021-03-17 09:40:23 +00:00
Lorenzo Colitti
5f37889a47
[automerger skipped] Increase test coverage for VPN info sent to NetworkStatsService. am: f0932b894a am: 5a339b5231 -s ours
...
am skip reason: skip tag Change-Id I3711b362f31cb92b759e9f5c9d244fb88d9bd5e7 with SHA-1 4525be8bfd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425311
Change-Id: Ib0939855e528d7c8268d290cd511deeb7c247192
2021-03-17 09:40:14 +00:00
Lorenzo Colitti
8c2453d549
[automerger skipped] Simplify MockVpn. am: 4b615c01e5 am: 03cff31e16 -s ours
...
am skip reason: skip tag Change-Id I49421183538ba61ca790af71e309ece36b653bf9 with SHA-1 bc3211dd81 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425310
Change-Id: I61d9213a4448374d899d8cd350cfaf3063e0b8be
2021-03-17 09:40:04 +00:00
Lorenzo Colitti
26d110993b
[automerger skipped] Test a VPN with an underlying network that does not yet exist. am: b32463cc53 am: 9dfd379583 -s ours
...
am skip reason: skip tag Change-Id Icc0701cb4cea7d91f7738c1e426e94cd26686b74 with SHA-1 ca7cebc1f6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425309
Change-Id: I843ca49b6d850c234e155a9cd06b1d246981d72a
2021-03-17 09:39:51 +00:00
TreeHugger Robot
f80adf07e2
Merge changes I6ec246a6,If7eb8857,Id3d12b23,Ia52f9caf,I21028457, ... into rvc-dev am: 65eb4a4332
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425320
Change-Id: Id5810e50b56389fe53f739f84ad79d8ef878e4f6
2021-03-17 09:15:05 +00:00
Lorenzo Colitti
ee04333c71
Backport test coverage from aosp/1547496. am: ee5ed04cbf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425319
Change-Id: I559be41c77cc6348e745324ab675c603b1f3ad1d
2021-03-17 09:15:02 +00:00
Lorenzo Colitti
646fa39db0
Backport some helpers in ConnectivityServiceTest. am: 853504c524
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425318
Change-Id: I7ffa0faf61ccc7238b65e0f9ed863939e5089f06
2021-03-17 09:14:59 +00:00
Lorenzo Colitti
402c1815e7
Test for bugs with suspended VPN underlying networks. am: 157af6c6d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425317
Change-Id: I28f2b0f682d8ee2982b8669267efe43ae0805778
2021-03-17 09:14:57 +00:00
Lorenzo Colitti
fee813bd91
Add a test for getDefaultNetworkCapabilitiesForUser. am: 6f7a5df35a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425316
Change-Id: Ic3b3584c25a0703aa273b47d042b2b339f1de2e7
2021-03-17 09:14:54 +00:00
Lorenzo Colitti
179f9147a6
Improve testing of CONNECTIVITY_ACTION broadcasts. am: 69a61d921b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425315
Change-Id: I889026eec095745be2e88f0c38392619c8ae6cfd
2021-03-17 09:14:49 +00:00
Lorenzo Colitti
357f4e82cd
Test passing an underlying network array with null network in it. am: b85a606d49
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425314
Change-Id: I7c78a186187db9c77c8980b670f802f9fd2e42ce
2021-03-17 09:14:46 +00:00
Lorenzo Colitti
75657895d9
Make testVpnNetworkActive more deterministic. am: abc306b5e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425313
Change-Id: I5b7901958bf96b0cee80c6124e004e57da0992cd
2021-03-17 09:14:44 +00:00
Lorenzo Colitti
753242551f
Make MockVpn more realistic and easier to use. am: 02e6be7824
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425312
Change-Id: I0e1ff975206ed180744c4c7a6f42e00b95589424
2021-03-17 09:14:41 +00:00
Lorenzo Colitti
5a339b5231
Increase test coverage for VPN info sent to NetworkStatsService. am: f0932b894a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425311
Change-Id: Ibea98977b36f0e9a71d47f0ec3fe4926516842f7
2021-03-17 09:14:38 +00:00
Lorenzo Colitti
03cff31e16
Simplify MockVpn. am: 4b615c01e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425310
Change-Id: Iff91a12ced969b34ba28b792e476c945eecdb817
2021-03-17 09:14:36 +00:00
Lorenzo Colitti
9dfd379583
Test a VPN with an underlying network that does not yet exist. am: b32463cc53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425309
Change-Id: Iac0a5305600fc70e05de90e4552258a0225d7f94
2021-03-17 09:14:32 +00:00
Lucas Lin
576f7c849f
Merge "Change the parameter type from ContentResolver to Context" into sc-dev
2021-03-17 03:27:28 +00:00
Aaron Huang
e1ede04913
Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants" into sc-dev
2021-03-17 03:16:56 +00:00
Lucas Lin
cb2db75d6f
Merge "Remove NETWORK_STACK_UID check" am: 5f7eb9024e am: f23bda53b2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635323
Change-Id: I82eec664bd11bfb713e52c08fc38dc49dec973c4
2021-03-16 12:44:29 +00:00
Lucas Lin
f23bda53b2
Merge "Remove NETWORK_STACK_UID check" am: 5f7eb9024e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635323
Change-Id: I5ae4b49d3168e48ccd6b61ee349ae89041e3de05
2021-03-16 12:06:10 +00:00
Lucas Lin
5f7eb9024e
Merge "Remove NETWORK_STACK_UID check"
2021-03-16 11:26:24 +00:00
Lucas Lin
8885169a2e
Merge "Add comments to describe the value of converting hex to decimal" am: 26f778d2bd am: dc6444c414
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635221
Change-Id: I200d8ccb606e3bf440aaba0a875097b56b79a0c6
2021-03-16 09:45:35 +00:00
lucaslin
acd3ded007
Change the parameter type from ContentResolver to Context
...
Context is more useful than ContentResolver, it can provide more
information if we want to change the behavior in the future.
Bug: 172183305
Test: atest FrameworksNetTests
Change-Id: I5702c7d74b862a76558b94f1abe2c6df9eb7f097
2021-03-16 17:25:28 +08:00
lucaslin
2d72a13e60
Remove NETWORK_STACK_UID check
...
NETWORK_STACK_UID check was introduced by aosp/1134635, and it
assumed that wifi factories/agents will be running on the network
stack process, but it didn't eventually. It runs in the system
server instead. So remove this check.
Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: Ie11268738e364e252f18876f7a4a0dc064ca8b9c
2021-03-16 09:16:38 +00:00
Lucas Lin
dc6444c414
Merge "Add comments to describe the value of converting hex to decimal" am: 26f778d2bd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635221
Change-Id: Id012600c0f06b25c90598543a20673e6f515bf29
2021-03-16 09:05:38 +00:00
Lucas Lin
9ecf4d330b
Merge "Have a new API to get private DNS mode" am: 11a286c9b5 am: eafa4097bd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620860
Change-Id: I5441212823663f02d20cecfbfdba126c8ed6e0de
2021-03-16 08:46:31 +00:00
Lucas Lin
26f778d2bd
Merge "Add comments to describe the value of converting hex to decimal"
2021-03-16 08:31:10 +00:00
Lucas Lin
eafa4097bd
Merge "Have a new API to get private DNS mode" am: 11a286c9b5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620860
Change-Id: I2600965b38f3039c0cca1c39d294ad9665aeab17
2021-03-16 08:06:35 +00:00
Lucas Lin
11a286c9b5
Merge "Have a new API to get private DNS mode"
2021-03-16 07:39:35 +00:00
Chalard Jean
a73e64726f
Merge "[NS01] Add NetworkScore" am: 98de10a7a1 am: 18294fcbb3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556099
Change-Id: I3fede24f8b38222d259f42e86ac27962ca687fb4
2021-03-16 07:08:25 +00:00
Remi NGUYEN VAN
40078d1567
Merge "Add ParseException constructors to API" am: ef7b38b334 am: 2299e83d12
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635044
Change-Id: If6c7a232857a801ea5872c3beeba90d426a72d5a
2021-03-16 07:08:04 +00:00
Chalard Jean
18294fcbb3
Merge "[NS01] Add NetworkScore" am: 98de10a7a1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556099
Change-Id: I71f1937ffd099283d7f753b843d4cf2a771fe22b
2021-03-16 06:53:52 +00:00
Remi NGUYEN VAN
2299e83d12
Merge "Add ParseException constructors to API" am: ef7b38b334
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635044
Change-Id: I2eca0681d3a94da26307663d56975327bbd06c6a
2021-03-16 06:49:08 +00:00
Chalard Jean
98de10a7a1
Merge "[NS01] Add NetworkScore"
2021-03-16 06:36:07 +00:00
Remi NGUYEN VAN
ef7b38b334
Merge "Add ParseException constructors to API"
2021-03-16 06:25:16 +00:00
Remi NGUYEN VAN
19e5014a61
Merge "Create ServiceConnectivityResources" am: eb46aa1c58 am: 4df498eb9a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620871
Change-Id: Ia7855ef7125726ecec0c4509b5026aeb5621cd3d
2021-03-16 03:50:47 +00:00