Remi NGUYEN VAN
e589e021dd
[automerger skipped] Merge "Remove extra comment" am: be83a4afc5 -s ours am: 3414a57e61 -s ours am: 516d3b7c75 -s ours
...
am skip reason: skip tag Change-Id I7432fe4c87cd3cab04dcb6185c9a4f3f84376549 with SHA-1 076dcdc403 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641959
Change-Id: I0c0daa91ef272a19c548cf55eb2f764c95f8f844
2021-03-17 22:20:12 +00:00
Lucas Lin
d04269e96d
Merge "Modify the comment of getPrivateDnsMode" am: de9a3af4de am: e0e9636048 am: 388c821087
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640143
Change-Id: I60147e1c828e5d82556e58b67b8f138f63228e8f
2021-03-17 22:19:20 +00:00
Remi NGUYEN VAN
4417837f49
Merge "Remove usage of networkAttributes" am: 5ccc21eb9b am: 5498465192 am: 9df643d6b6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623260
Change-Id: I84aa41ee98535b3b258e52cb67b8f7964d63851b
2021-03-17 22:18:55 +00:00
TreeHugger Robot
bd59ba1955
[automerger skipped] Merge changes I6ec246a6,If7eb8857,Id3d12b23,Ia52f9caf,I21028457, ... into rvc-dev am: 65eb4a4332 -s ours am: 01a59e4727 -s ours am: f0c45658c8 -s ours
...
am skip reason: skip tag Change-Id I6ec246a6a4e61f634956a165797fbb80296efd6a with SHA-1 cbaf93951c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425320
Change-Id: I2f4ae9a474007eb1b2d63c20463f28d21e54aa14
2021-03-17 22:18:21 +00:00
Lucas Lin
bb0a04be85
[automerger skipped] Merge "Change the parameter type from ContentResolver to Context" am: 8d638d9434 am: 8df3a6b774 am: c6bd2f85e6 -s ours
...
am skip reason: skip tag Change-Id I5702c7d74b862a76558b94f1abe2c6df9eb7f097 with SHA-1 acd3ded007 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639900
Change-Id: Id713c440298bb0c410fbba74cb62550e1d5f90e9
2021-03-17 22:13:33 +00:00
Chalard Jean
63d9588dca
Merge changes I335e82e2,I84ba363d,I8f18083b,I854a952d,I00e23441 am: bf97a3ab5e am: ba22df4f9d am: 2d82b40262
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622621
Change-Id: I5fa8e7b8bf35a5464868fdca4d115b3f9132c65f
2021-03-17 22:13:06 +00:00
Remi NGUYEN VAN
8d2f1d6f06
Merge "Remove MessageUtils usage in VpnTransportInfo" am: 0b33d35188 am: e1aa50a18a am: 8248cbc3da
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635041
Change-Id: Ibf1592220cedb387d8edba27a7bbe49a36f42dc0
2021-03-17 22:10:16 +00:00
Remi NGUYEN VAN
cfa1528c88
Merge "Move LocationPermissionChecker to libs/net" am: 6dde6eceab am: eccbb61f58 am: 78bae8b5dd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618840
Change-Id: Ia9beda02a8183eda4fe195404980d4d9012afb3f
2021-03-17 22:09:51 +00:00
Junyu Lai
f4cbe4d191
Merge "[VCN14] Expose registerBestMatchingNetworkCallback" am: 29908cf3c4 am: 789f3829a0 am: b77d000812
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635047
Change-Id: Ic0cb87f3ac4e9df7b0b6e2d0344c43e66499900e
2021-03-17 22:08:56 +00:00
Junyu Lai
2ac4e6eee4
Merge "[VCN13] Implement tracking best matching network" am: f98037abb3 am: 4377c5d40c am: b56ee13b44
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633519
Change-Id: Ie252014cd9047c27fad3e451b80047493935dc3d
2021-03-17 16:08:50 +00:00
Paul Hu
082ec98e2a
Merge "Replace interal okhttp APIs" am: e3ed08a24d am: c7b4df71f6 am: 970d67d760
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622669
Change-Id: Ida687a8987385ef4525e41e609d7c8fedda9f1da
2021-03-17 16:07:31 +00:00
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
Remi NGUYEN VAN
516d3b7c75
[automerger skipped] Merge "Remove extra comment" am: be83a4afc5 -s ours am: 3414a57e61 -s ours
...
am skip reason: skip tag Change-Id I7432fe4c87cd3cab04dcb6185c9a4f3f84376549 with SHA-1 d2107994d6 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641959
Change-Id: Iefe558673fff3558f68d7e627ea55e64252d5ebd
2021-03-17 13:32:31 +00:00
Remi NGUYEN VAN
3414a57e61
[automerger skipped] Merge "Remove extra comment" am: be83a4afc5 -s ours
...
am skip reason: skip tag Change-Id I7432fe4c87cd3cab04dcb6185c9a4f3f84376549 with SHA-1 d2107994d6 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641959
Change-Id: Ifd4bbb99c60e9d538fc87d5015dc2b0f7af4d125
2021-03-17 12:54:22 +00:00
Lucas Lin
388c821087
Merge "Modify the comment of getPrivateDnsMode" am: de9a3af4de am: e0e9636048
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640143
Change-Id: I89b6f26b1017173033be8f744bbf41683239e3e0
2021-03-17 12:35:08 +00:00
Remi NGUYEN VAN
9df643d6b6
Merge "Remove usage of networkAttributes" am: 5ccc21eb9b am: 5498465192
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623260
Change-Id: Iffc2da273156fc670834b809b06b5cfbb0c2c0ac
2021-03-17 12:34:48 +00:00
Remi NGUYEN VAN
be83a4afc5
Merge "Remove extra comment"
2021-03-17 12:16:09 +00:00
Lucas Lin
e0e9636048
Merge "Modify the comment of getPrivateDnsMode" am: de9a3af4de
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640143
Change-Id: I46131b18e8e09d1c2b7a0b3fe5913511942b7096
2021-03-17 11:54:29 +00:00
Remi NGUYEN VAN
5498465192
Merge "Remove usage of networkAttributes" am: 5ccc21eb9b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623260
Change-Id: I52a3125843e093c5a7d0d80c2a5c9608b397ea00
2021-03-17 11:51:17 +00:00
Lucas Lin
de9a3af4de
Merge "Modify the comment of getPrivateDnsMode"
2021-03-17 11:25:18 +00:00
Remi NGUYEN VAN
5ccc21eb9b
Merge "Remove usage of networkAttributes"
2021-03-17 11:24:28 +00:00
Remi NGUYEN VAN
eade234e2a
Remove extra comment
...
This fixes a merge conflict with downstream branches due to an
incomplete cherry-pick.
Bug: 171540887
Test: m
Change-Id: I27a8f20f1a1d83b472700648f3f5a68413a76ac3
Merged-In: I7432fe4c87cd3cab04dcb6185c9a4f3f84376549
2021-03-17 10:58:08 +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
f0c45658c8
[automerger skipped] Merge changes I6ec246a6,If7eb8857,Id3d12b23,Ia52f9caf,I21028457, ... into rvc-dev am: 65eb4a4332 -s ours am: 01a59e4727 -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: I9ba0cda341b8d780c2d80c8fd84613bf558e1a8a
2021-03-17 09:34:28 +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