Commit Graph

10216 Commits

Author SHA1 Message Date
Xin Li
e0a1ab503c [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 551b6e094b -s ours am: 8c453bdce0 -s ours
am skip reason: Change-Id I5e28537689d1a53e99f91eafd494eb3a0c890f46 with SHA-1 afbf77813b is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1323623

Change-Id: I3811100a743b62c5a5e9f661647793b719824679
2020-06-08 16:08:03 +00:00
Xin Li
8c453bdce0 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 551b6e094b -s ours
am skip reason: Change-Id I5e28537689d1a53e99f91eafd494eb3a0c890f46 with SHA-1 afbf77813b is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1323623

Change-Id: Iacc1884e345d9df125b3a9bbf32d1d10d3a4757d
2020-06-08 15:56:48 +00:00
TreeHugger Robot
a29f7baa7b [automerger skipped] Merge "Update javadoc to use complete sentence" into rvc-dev am: 1f883f9099 -s ours
am skip reason: Change-Id I41bf8a6ddad200f00524d9b2dd1bf169810ee460 with SHA-1 8b60559b7e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11745980

Change-Id: I5d2a2bb388181fa798c934dd94bf65df29d13dc3
2020-06-08 09:10:45 +00:00
Xin Li
551b6e094b Merge "Merge QQ3A.200605.002 into master" 2020-06-06 01:41:11 +00:00
Treehugger Robot
9d2a21503b Update javadoc to use complete sentence
Avoid using the "iff" abbreviation in our Javadoc.

Bug: 158092978
Test: m doc-comment-check-docs and check the generated doc
Merged-In: I41bf8a6ddad200f00524d9b2dd1bf169810ee460
Change-Id: I41bf8a6ddad200f00524d9b2dd1bf169810ee460
2020-06-05 04:50:14 +00:00
Treehugger Robot
6c4884bc12 Merge "Update javadoc to use complete sentence" am: d3068f93c3 am: bd1d9f134f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1323953

Change-Id: I357ae71b7f86ed3560333a67a2444eb8bb93c71c
2020-06-05 03:36:44 +00:00
Treehugger Robot
bd1d9f134f Merge "Update javadoc to use complete sentence" am: d3068f93c3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1323953

Change-Id: I6c8358c81bbc7a08802ef027fcd32adea4821ba0
2020-06-05 03:17:00 +00:00
Treehugger Robot
d3068f93c3 Merge "Update javadoc to use complete sentence" 2020-06-05 03:02:36 +00:00
Chiachang Wang
d33028c205 Update extra info before registering
The extra info is taken into NetworkMonitor from while creating
it. The NetworkMonitor is created when a new agent is registered
but the extra info is not available at that time. Make sure the
field is set in the NetworkInfo when registering.

Bug: 156173829
Test: adb shell dumpsys network and check the apn in the extra
      info shown correctly
Test: atest FrameworkNetTests
Merged-In: Ieaad8cbf1a28af3b97c7f98f74358e417fcad661
Change-Id: Ieaad8cbf1a28af3b97c7f98f74358e417fcad661
2020-06-05 01:46:06 +00:00
Chiachang Wang
57e93bef72 Merge "Update extra info before registering" am: 6f9c48b81e am: d5420bf1f9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1310538

Change-Id: I5e38601026c1f9d30fee58a40bfb1ad467f41e35
2020-06-05 00:41:42 +00:00
Chiachang Wang
d5420bf1f9 Merge "Update extra info before registering" am: 6f9c48b81e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1310538

Change-Id: I6eb786edfe615574c731097df09ae3142e137999
2020-06-05 00:24:09 +00:00
Chiachang Wang
6f9c48b81e Merge "Update extra info before registering" 2020-06-05 00:04:04 +00:00
android-build-team Robot
db28a6c1fc Make change and version bump to r_aml_300800200 for mainline module file: packages/Tethering/apex/manifest.json
Change-Id: I265ac5f72edf4fdb396ed00c7db5d30d21706f6e
2020-06-04 21:53:22 +00:00
Chiachang Wang
8b60559b7e Update javadoc to use complete sentence
Avoid using the "iff" abbreviation in our Javadoc.

Bug: 158092978
Test: m doc-comment-check-docs and check the generated doc
Change-Id: I41bf8a6ddad200f00524d9b2dd1bf169810ee460
2020-06-04 07:46:14 +00:00
android-build-team Robot
96bc75a9ad Snap for 6557338 from 9b75996d5e757dc275456839df3dc3346a592bab to rvc-release
Change-Id: I0f2203ba56adaa39568d546d4b3df67a28ff98cc
2020-06-04 01:11:51 +00:00
Junyu Lai
e3607f739e [automerger skipped] Merge "Disable log for per uid blocked status changed event" into rvc-dev am: cba8b949b3 -s ours
am skip reason: Change-Id I04d2b7402f892546722fe6868c521afd9534f183 with SHA-1 31a6c32056 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700105

Change-Id: Icfce11d306a9d47ecad5d17d3bfab3dbdf9e4693
2020-06-03 06:36:40 +00:00
Chiachang Wang
9774ceb3ea Update extra info before registering
The extra info is taken into NetworkMonitor from while creating
it. The NetworkMonitor is created when a new agent is registered
but the extra info is not available at that time. Make sure the
field is set in the NetworkInfo when registering.

Bug: 156173829
Test: adb shell dumpsys network and check the apn in the extra
      info shown correctly
Test: atest FrameworkNetTests
Change-Id: Ieaad8cbf1a28af3b97c7f98f74358e417fcad661
2020-06-03 13:01:01 +08:00
android-build-team Robot
269ce08931 Snap for 6553159 from dc3a232010ccd8f36ce9b31597bd8d16051fc513 to rvc-release
Change-Id: Id9945728e0435903eb24a2d64684f3043e0c401d
2020-06-03 01:10:17 +00:00
Junyu Lai
edb74fd839 Disable log for per uid blocked status changed event
This consumes ~3.5% system logs, however it is not very useful
when debugging since similar information could be obtained from
dumpsys {connectivity|netpolicy}. Thus, remove the log.

Test: manual
Bug: 135504481
Change-Id: I04d2b7402f892546722fe6868c521afd9534f183
Merged-In: I04d2b7402f892546722fe6868c521afd9534f183
(cherry picked from commit 21a352f761ce558bea6fa9ab2a4e49a164228b56)
2020-06-02 10:19:41 +00:00
Junyu Lai
6abbe1bcc7 Merge "Disable log for per uid blocked status changed event" am: d66468ca25 am: 528f5debe1
Original change: undetermined

Change-Id: I2783cc948365a37b7446064cfc00714ab6abba17
2020-06-02 10:06:42 +00:00
Junyu Lai
528f5debe1 Merge "Disable log for per uid blocked status changed event" am: d66468ca25
Original change: undetermined

Change-Id: I6ba38a19e1ac1d7f3f3eccef76aa10f75273ca47
2020-06-02 09:52:38 +00:00
Junyu Lai
d66468ca25 Merge "Disable log for per uid blocked status changed event" 2020-06-02 09:39:30 +00:00
android-build-team Robot
0ec00a3367 Snap for 6549967 from 48059224ebc2fa3c4c6216667a7182fbf4f0ef93 to mainline-release
Change-Id: I3a262f7441f4b09bb2a439587d161156087d56fa
2020-06-02 07:03:57 +00:00
junyulai
31a6c32056 Disable log for per uid blocked status changed event
This consumes ~3.5% system logs, however it is not very useful
when debugging since similar information could be obtained from
dumpsys {connectivity|netpolicy}. Thus, remove the log.

Test: manual
Bug: 135504481
Change-Id: I04d2b7402f892546722fe6868c521afd9534f183
2020-06-02 14:26:36 +08:00
Remi NGUYEN VAN
d8275d61c7 [automerger skipped] Merge "Allow TRANSPORT_TEST ethernet networks" into rvc-dev am: fcd1fd8f26 -s ours
am skip reason: Change-Id I0d9477977c88aa055625ab4046577a41e76b05ff with SHA-1 656c566cf1 is in history

Original change: undetermined

Change-Id: I4b1233d27e377981cea021dc383a5b1b43dfcb8c
2020-06-02 00:24:45 +00:00
Maciej Żenczykowski
466fc61e20 [automerger skipped] Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" am: 4bf80c0b90 am: 5b8a4a37af -s ours
am skip reason: Change-Id Iea0c2488dcabdd24d6ffca8134cd11ed12e8308a with SHA-1 7bdbb811ff is in history

Change-Id: I47d76b218e21deedc9425938cc20cc2d30fbbab6
2020-06-01 02:23:53 +00:00
Maciej Żenczykowski
5b8a4a37af Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" am: 4bf80c0b90
Change-Id: I4128678546feba6840ddb210244992846705e5d9
2020-06-01 02:14:25 +00:00
Maciej Żenczykowski
4bf80c0b90 Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" 2020-06-01 02:00:40 +00:00
Remi NGUYEN VAN
bfd4336f31 Allow TRANSPORT_TEST ethernet networks
Ethernet networks using tap interfaces should have TRANSPORT_TEST so
they are not considered by network selection.

Test: atest CaptivePortalApiTest FrameworksNetTests
Bug: 156319532
Original-Change: https://android-review.googlesource.com/1317238
Merged-In: I0d9477977c88aa055625ab4046577a41e76b05ff
Change-Id: I0d9477977c88aa055625ab4046577a41e76b05ff
2020-06-01 01:43:32 +00:00
android-build-team Robot
7f576f125f Snap for 6545159 from 9c234038c3c27e0b8728825b93b0037316d5708e to mainline-release
Change-Id: I54aee6d4c4c178ed29654d832a99589e8f84e218
2020-05-31 07:09:59 +00:00
Luke Huang
c9dcbcd597 Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS
NETID_USE_LOCAL_NAMESERVERS is no longer in libnetd_client

Bug: 151895202
Test: build
Change-Id: Iea0c2488dcabdd24d6ffca8134cd11ed12e8308a
Merged-In: Iea0c2488dcabdd24d6ffca8134cd11ed12e8308a
2020-05-30 19:04:44 -07:00
android-build-team Robot
6432cb3510 Snap for 6542686 from 7f3570724deecf3933cfb4d1cd98b014ef513c45 to rvc-release
Change-Id: Id4d5eafbfac86414fe2dc3a8e45812efac9428bb
2020-05-30 01:05:18 +00:00
Remi NGUYEN VAN
b9bd905c0b Merge "Allow TRANSPORT_TEST ethernet networks" am: 6642ec61c3 am: 54c3c2b3c7
Change-Id: I030f0aeb0f196fee213fee02a25c5a7e66618b93
2020-05-29 22:09:13 +00:00
Benedict Wong
4b104c3dad Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" am: de684cfa06 am: 29879886c9
Change-Id: I30379974f8396abbb30877f88356c38bea002968
2020-05-29 22:05:59 +00:00
Remi NGUYEN VAN
54c3c2b3c7 Merge "Allow TRANSPORT_TEST ethernet networks" am: 6642ec61c3
Change-Id: Ib9ab1ddb855c90219e94c4b74dc7268cfbcdb661
2020-05-29 21:43:41 +00:00
Benedict Wong
29879886c9 Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" am: de684cfa06
Change-Id: I4a135e75105a49b25b65ba76a3c252467bd9d5ea
2020-05-29 21:41:40 +00:00
Benedict Wong
f4a72ac0ff Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" into rvc-dev am: 36d9c275ac
Change-Id: Ibc0f236234cd87d50a393c3dfaca7898b04e7432
2020-05-29 17:32:42 +00:00
Benedict Wong
36d9c275ac Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" into rvc-dev 2020-05-29 17:17:10 +00:00
Cody Kesting
45bc099adc [automerger skipped] Merge "Comment reason for simulateDataStall structure." into rvc-dev am: 84ad118843 -s ours
am skip reason: Change-Id I751054418bf328c72b977a1cc99c27cb9b8ab7ba with SHA-1 652e3ec4f1 is in history

Change-Id: I38c6caaa9805bc6e0adb553223a26b6561d62ab6
2020-05-29 16:40:31 +00:00
Cody Kesting
84ad118843 Merge "Comment reason for simulateDataStall structure." into rvc-dev 2020-05-29 16:29:23 +00:00
TreeHugger Robot
debec6087b Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" into rvc-dev am: 51de3f8a10
Change-Id: Ib788169bef168bde7bd49de3dfee6b4e3fcb2561
2020-05-29 14:09:22 +00:00
TreeHugger Robot
51de3f8a10 Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" into rvc-dev 2020-05-29 14:01:18 +00:00
android-build-team Robot
989b38331b Snap for 6539570 from b04b04a849eac3c27464bc76d16909fad37bedf5 to mainline-release
Change-Id: I03a57a5f17ac6753aba6153ceb0548dd31d017c7
2020-05-29 07:02:51 +00:00
Remi NGUYEN VAN
6642ec61c3 Merge "Allow TRANSPORT_TEST ethernet networks" 2020-05-29 06:26:14 +00:00
Chalard Jean
1706cf3898 [automerger skipped] Merge "Adjust tests for renaming groupHint to cluster." into rvc-dev am: 6489161fd5 -s ours
am skip reason: Change-Id I69f7a2971cc5985d0f0078aecc39d4d6a6130033 with SHA-1 3cd880b4bb is in history

Change-Id: Ic26210767bf8f4026c7074c048e77300e29d7a24
2020-05-29 04:21:16 +00:00
Automerger Merge Worker
dcb0e912b1 Adjust tests for renaming groupHint to cluster.
Bug: 146460486
Test: atest android.net.IpMemoryStoreTest
Test: atest com.android.server.connectivity.ipmemorystore.IpMemoryStoreServiceTest
Change-Id: Ia9797bb93aa4ff89147a77823d342dc22aec6a25
Merged-In: I69f7a2971cc5985d0f0078aecc39d4d6a6130033
(cherry-picked from aosp/1311654)
2020-05-29 02:28:59 +00:00
Benedict Wong
ba8ca78394 Add RequiresFeature annotations for IKEv2 VPN profiles
This change adds the @RequiresFeature annotation to Ikev2VpnProfile
Builder methods, and checks before provisioning VPN profiles.

Bug: 156681625
Test: New tests added, passing.
Change-Id: I125d8fbe5d67fb877ad7d0636c007cb3e1a9f59b
Merged-In: I125d8fbe5d67fb877ad7d0636c007cb3e1a9f59b
(cherry picked from commit e84a17dd1706f4c8373047b2023a1ec4b7cf4bf3)
2020-05-28 19:07:29 -07:00
Benedict Wong
de684cfa06 Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" 2020-05-29 01:55:08 +00:00
Remi NGUYEN VAN
656c566cf1 Allow TRANSPORT_TEST ethernet networks
Ethernet networks using tap interfaces should have TRANSPORT_TEST so
they are not considered by network selection.

Test: atest CaptivePortalApiTest FrameworksNetTests
Bug: 156319532
Change-Id: I0d9477977c88aa055625ab4046577a41e76b05ff
2020-05-29 10:22:50 +09:00
android-build-team Robot
bbe5adc5da Snap for 6538416 from 4911db037b82a92a30c0bed2ce01b7516c4f414a to rvc-release
Change-Id: I4f4c4465f8c042839083209d51b523e41d30f896
2020-05-29 01:02:11 +00:00