Commit Graph

11509 Commits

Author SHA1 Message Date
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
084aca4487 Merge "Update javadoc to use complete sentence" am: d3068f93c3 am: bd1d9f134f am: 6c4884bc12 am: 49dbee38c8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1323953

Change-Id: Ic42ac7629297947bc6c8bba0c6d29cdb133764fd
2020-06-05 03:39:38 +00:00
Treehugger Robot
49dbee38c8 Merge "Update javadoc to use complete sentence" am: d3068f93c3 am: bd1d9f134f am: 6c4884bc12
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1323953

Change-Id: I47f39a31a066f35a75690ca5ab4827b8d6a89a08
2020-06-05 03:37:22 +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
535905cc7a Merge "Update extra info before registering" am: 6f9c48b81e am: d5420bf1f9 am: 57e93bef72 am: de1cd4b449
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1310538

Change-Id: I377a731be6cb95ac001fb0e3f141795662000c9e
2020-06-05 01:11:21 +00:00
Chiachang Wang
de1cd4b449 Merge "Update extra info before registering" am: 6f9c48b81e am: d5420bf1f9 am: 57e93bef72
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1310538

Change-Id: Ied436e6ae963d87cadfd2b1318429e0036fa509f
2020-06-05 00:42:47 +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
05924ea402 [automerger skipped] Merge "Disable log for per uid blocked status changed event" into rvc-dev am: cba8b949b3 -s ours am: e3607f739e -s ours am: 69b30f306e -s ours
am skip reason: Change-Id I04d2b7402f892546722fe6868c521afd9534f183 with SHA-1 edb74fd839 is in history

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

Change-Id: I658ff5397aa764f672fb3e7ec71293ae2207a768
2020-06-03 07:03:09 +00:00
Junyu Lai
f1c989e482 [automerger skipped] Merge "Disable log for per uid blocked status changed event" into rvc-dev am: cba8b949b3 am: dac17d9337 -s ours am: 93f71088e5 -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: Ie12502a007d633fbd1404a846e21d23adf9c7326
2020-06-03 07:02:00 +00:00
Junyu Lai
69b30f306e [automerger skipped] Merge "Disable log for per uid blocked status changed event" into rvc-dev am: cba8b949b3 -s ours am: e3607f739e -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: I232a78e6639af90c9eae0b75e88c64e2edc58915
2020-06-03 06:49:41 +00:00
Junyu Lai
93f71088e5 [automerger skipped] Merge "Disable log for per uid blocked status changed event" into rvc-dev am: cba8b949b3 am: dac17d9337 -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: Idc5c9af45bccd7a87eb5c55f4d94345a48cda36d
2020-06-03 06:49:25 +00:00
Junyu Lai
dac17d9337 Merge "Disable log for per uid blocked status changed event" into rvc-dev am: cba8b949b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700105

Change-Id: Iaafbe392cbbfa220d6c02b3fa1eced2ac683b8fe
2020-06-03 06:37:03 +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
2b44dfe307 Merge "Disable log for per uid blocked status changed event" am: d66468ca25 am: 528f5debe1 am: 6abbe1bcc7 am: 399391491d
Original change: undetermined

Change-Id: Ib0d04da8d228984ef952f624a830b8d10333d8f4
2020-06-02 10:24:41 +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
399391491d Merge "Disable log for per uid blocked status changed event" am: d66468ca25 am: 528f5debe1 am: 6abbe1bcc7
Original change: undetermined

Change-Id: I841d7042f27b8ef301e69800a7b86d5b5babd3a3
2020-06-02 10:07:37 +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
6b2478c07f [automerger skipped] Merge "Allow TRANSPORT_TEST ethernet networks" into rvc-dev am: fcd1fd8f26 am: 8aa298adce -s ours am: 744ccd1866 -s ours
am skip reason: Change-Id I0d9477977c88aa055625ab4046577a41e76b05ff with SHA-1 bfd4336f31 is in history

Original change: undetermined

Change-Id: I34e837a2d2845d3a61196190ec066b3a11c75f53
2020-06-02 00:53:22 +00:00
Remi NGUYEN VAN
744ccd1866 [automerger skipped] Merge "Allow TRANSPORT_TEST ethernet networks" into rvc-dev am: fcd1fd8f26 am: 8aa298adce -s ours
am skip reason: Change-Id I0d9477977c88aa055625ab4046577a41e76b05ff with SHA-1 bfd4336f31 is in history

Original change: undetermined

Change-Id: Id6ad7c1d429a0c9804e8adaf1b679436bfd20c27
2020-06-02 00:41:38 +00:00
Remi NGUYEN VAN
fe119de767 [automerger skipped] Merge "Allow TRANSPORT_TEST ethernet networks" into rvc-dev am: fcd1fd8f26 -s ours am: d8275d61c7 -s ours am: 76cccfd040 -s ours
am skip reason: Change-Id I0d9477977c88aa055625ab4046577a41e76b05ff with SHA-1 656c566cf1 is in history

Original change: undetermined

Change-Id: I1fb77f926bbbfd5553076082fc723cc1c27660e6
2020-06-02 00:34:56 +00:00
Remi NGUYEN VAN
76cccfd040 [automerger skipped] Merge "Allow TRANSPORT_TEST ethernet networks" into rvc-dev am: fcd1fd8f26 -s ours am: d8275d61c7 -s ours
am skip reason: Change-Id I0d9477977c88aa055625ab4046577a41e76b05ff with SHA-1 656c566cf1 is in history

Original change: undetermined

Change-Id: I821ea2b89e5c81e3b2524d23a4f80dbdd42fadf4
2020-06-02 00:33:33 +00:00
Remi NGUYEN VAN
8aa298adce Merge "Allow TRANSPORT_TEST ethernet networks" into rvc-dev am: fcd1fd8f26
Original change: undetermined

Change-Id: Ida76ccf2f5b99f77c17ae3ff732e7f56a1676306
2020-06-02 00:25:06 +00: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
3abe2258dd [automerger skipped] Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" am: 4bf80c0b90 am: 5b8a4a37af -s ours am: 466fc61e20 -s ours am: db8dbafd81 -s ours
am skip reason: Change-Id Iea0c2488dcabdd24d6ffca8134cd11ed12e8308a with SHA-1 7bdbb811ff is in history

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

Change-Id: Ic02c533761d63b970a7fa094b9d25e0ccb1bbcd0
2020-06-01 02:37:12 +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
3a991fffe2 Merge "Allow TRANSPORT_TEST ethernet networks" am: 6642ec61c3 am: 54c3c2b3c7 am: b9bd905c0b am: 52d893b487
Change-Id: I3d2dac83f2c6a3d7b7d549a0dee181d4d299d835
2020-05-29 22:40:39 +00:00
Benedict Wong
7789d62cf6 Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" am: de684cfa06 am: 29879886c9 am: 4b104c3dad am: 1c0852da13
Change-Id: Iec249ec6520b817524dd3d7cf49457934fab80c8
2020-05-29 22:38:58 +00:00
Remi NGUYEN VAN
52d893b487 Merge "Allow TRANSPORT_TEST ethernet networks" am: 6642ec61c3 am: 54c3c2b3c7 am: b9bd905c0b
Change-Id: I700348afa0468a0d339f6c11800466609085afba
2020-05-29 22:27:01 +00:00