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
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
Lorenzo Colitti
e145deff18
Merge "Call clearCallingIdentity when calling registerNetworkProvider in TNS" am: 85bea4887f am: 3e0314d68f am: 35667ce499
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635045
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib9169b66fd9f5bccfbbfaa69392ff176e41d4b53
2021-03-15 15:09:22 +00:00
Aaron Huang
7370ec0110
Move some constants from TrafficStatsConstants to NetworkStackConstants
...
Keep the constants are only used by framework in TrafficStatsConstants
and move the others to NetworkStackConstants which is in libs/net.
Bug: 182349970
Test: FrameworksNetTests
NetworkStackTests
TetheringTests
Change-Id: Ib667c115e5f1e01237d88b77bba753363da309cc
2021-03-15 22:50:37 +08:00
Lorenzo Colitti
35667ce499
Merge "Call clearCallingIdentity when calling registerNetworkProvider in TNS" am: 85bea4887f am: 3e0314d68f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635045
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6edda160620b4a3cbcf85f21081a41d959cf3173
2021-03-15 14:24:34 +00:00
Lorenzo Colitti
3e0314d68f
Merge "Call clearCallingIdentity when calling registerNetworkProvider in TNS" am: 85bea4887f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635045
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie0ca67f38da9d4a70911485d2630fe8bae4cbdfa
2021-03-15 13:48:39 +00:00
Lorenzo Colitti
85bea4887f
Merge "Call clearCallingIdentity when calling registerNetworkProvider in TNS"
2021-03-15 13:09:14 +00:00
Aaron Huang
3519718a56
Merge changes from topic "pacproxy-service" am: 267bebc6a9 am: de062690cc am: 2b89f2ae7f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553959
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If6d34753e8bf9201e16121b8f3c6c83aa6358986
2021-03-15 12:56:09 +00:00
Sorin Basca
d569b2f54b
Merge changes from topic "jni-errno-exception" am: 685a40571c am: d43926c07a am: 5d1f25b158
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619421
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5cb0d95a0eaab330b0763927c92495e50b97cd27
2021-03-15 12:55:03 +00:00
Aaron Huang
2b89f2ae7f
Merge changes from topic "pacproxy-service" am: 267bebc6a9 am: de062690cc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553959
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ife210de3adbdaff6c88caf744d805571b365b294
2021-03-15 12:30:17 +00:00
Aaron Huang
de062690cc
Merge changes from topic "pacproxy-service" am: 267bebc6a9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553959
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I29e9e324f25e584d645900f83d31a00a4e151cbb
2021-03-15 12:12:48 +00:00
Sorin Basca
5d1f25b158
Merge changes from topic "jni-errno-exception" am: 685a40571c am: d43926c07a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619421
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib4106aed41c8e00a27fa8fb6dbc4dba5ac08d6c2
2021-03-15 12:12:35 +00:00
Aaron Huang
267bebc6a9
Merge changes from topic "pacproxy-service"
...
* changes:
Make PacProxyService be a system service
Revert^2 "Refactor setCurrentProxyScriptUrl to a void method"
2021-03-15 11:49:45 +00:00
Sorin Basca
d43926c07a
Merge changes from topic "jni-errno-exception" am: 685a40571c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619421
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If704b8e72e74f0e1afcfc59d5ad03c3003e2643a
2021-03-15 11:34:48 +00:00
Sorin Basca
685a40571c
Merge changes from topic "jni-errno-exception"
...
* changes:
Using jniThrowErrnoException in android_util_Process
Using jniThrowErrnoException in android_os_SharedMemory
Using jniThrowErrnoException in android_net_NetworkUtils
2021-03-15 11:16:14 +00:00
Frank Li
8899a3e8f5
[automerger skipped] Merge "[CS15]Do not use hidden API of PlatformProperties" am: b9db86ff3b am: 44d34df483 am: 7e3ba1577f -s ours
...
am skip reason: Change-Id I3a3deca5d2e0f690db8c0061de2db2217376d268 with SHA-1 cc5af7e9ca is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623261
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If2de4002e694a8063b60b0f6b043bb8830e7a373
2021-03-15 09:41:10 +00:00
Frank Li
7e3ba1577f
Merge "[CS15]Do not use hidden API of PlatformProperties" am: b9db86ff3b am: 44d34df483
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623261
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4bd903cd723f0c3d87ac9d2aae14a95132e7a2ea
2021-03-15 09:18:29 +00:00
Frank Li
44d34df483
Merge "[CS15]Do not use hidden API of PlatformProperties" am: b9db86ff3b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623261
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I623fd33e756f9ada6b73f716a30778fd6236f6ae
2021-03-15 08:42:02 +00:00
Remi NGUYEN VAN
5b5607e0cd
Merge "Revert "Remove connectivity dependency on Preconditions"" am: c407499db5 am: 46adcba662 am: d38a017b28
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635220
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I04b48a4afef8d62d1368f5c7f7d907cb5e12c82e
2021-03-15 08:26:55 +00:00
Paul Hu
ffd7c1f14f
Merge "Replace InetAddress#parseNumericAddress" am: 67503fefc6 am: 23be8da17e am: 174ffe652c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614980
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia6f19204d54688ea6af69d503c6dae441ff7afce
2021-03-15 08:26:28 +00:00
Remi NGUYEN VAN
d92103dfc0
Merge "Remove connectivity dependency on Preconditions" am: 83c34e272a am: b8c6c46986 am: 3ddc646220
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628399
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia618516b1cd0096b9550dea38703bde3692915cf
2021-03-15 08:25:36 +00:00
Frank Li
b9db86ff3b
Merge "[CS15]Do not use hidden API of PlatformProperties"
2021-03-15 08:01:26 +00:00
Remi NGUYEN VAN
d38a017b28
Merge "Revert "Remove connectivity dependency on Preconditions"" am: c407499db5 am: 46adcba662
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635220
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I396e8936cf8adc0c46555a3ef5d7771d3a268594
2021-03-15 08:01:03 +00:00
Paul Hu
174ffe652c
Merge "Replace InetAddress#parseNumericAddress" am: 67503fefc6 am: 23be8da17e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614980
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5f14d0196b3c641108b1e82def2998d2744cb855
2021-03-15 07:44:28 +00:00
Remi NGUYEN VAN
46adcba662
Merge "Revert "Remove connectivity dependency on Preconditions"" am: c407499db5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635220
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7dbcb1e49162210b44bd0cf2204b853c34bb5871
2021-03-15 07:44:21 +00:00