Commit Graph

10808 Commits

Author SHA1 Message Date
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
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
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
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
Benedict Wong
1c0852da13 Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" am: de684cfa06 am: 29879886c9 am: 4b104c3dad
Change-Id: I8b4b8810c2cb32f9cc7b4899491f98176de92e76
2020-05-29 22:25:22 +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
703252326e [automerger skipped] Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" into rvc-dev am: 36d9c275ac am: f4a72ac0ff -s ours am: d4e9e1a6fe -s ours
am skip reason: Change-Id I125d8fbe5d67fb877ad7d0636c007cb3e1a9f59b with SHA-1 ba8ca78394 is in history

Change-Id: Ice68d966cf49980d2fc2a4b2fd674e6812bf8aa4
2020-05-29 18:06:12 +00:00
Benedict Wong
723f11fb68 Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" into rvc-dev am: 36d9c275ac am: 1d63ae83d2 am: 5dab1e1011
Change-Id: I1198643916b9b5d4641145424aa53692a36ef354
2020-05-29 18:05:41 +00:00
Benedict Wong
d4e9e1a6fe [automerger skipped] Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" into rvc-dev am: 36d9c275ac am: f4a72ac0ff -s ours
am skip reason: Change-Id I125d8fbe5d67fb877ad7d0636c007cb3e1a9f59b with SHA-1 ba8ca78394 is in history

Change-Id: I15aa826d5d64a85af40a24278da070aeae5c422c
2020-05-29 17:46:02 +00:00
Benedict Wong
5dab1e1011 Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" into rvc-dev am: 36d9c275ac am: 1d63ae83d2
Change-Id: Id03dc7e3e2912f308b4ed42f2cc8cae80d9cd95d
2020-05-29 17:45:55 +00:00
Benedict Wong
1d63ae83d2 Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" into rvc-dev am: 36d9c275ac
Change-Id: If586cc601523aced520da3ebba00bca60d34a794
2020-05-29 17:32:44 +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
Cody Kesting
df8a6ab7c0 [automerger skipped] Merge "Comment reason for simulateDataStall structure." into rvc-dev am: 84ad118843 -s ours am: 45bc099adc -s ours am: bcd6b7762c -s ours
am skip reason: Change-Id I751054418bf328c72b977a1cc99c27cb9b8ab7ba with SHA-1 2796382103 is in history

Change-Id: Ic8ffec6c6692e38105c44c3db4f1c1d0296abb8a
2020-05-29 17:22:39 +00:00
Automerger Merge Worker
2a026a338c Merge "[automerger skipped] Merge "Comment reason for simulateDataStall structure." into rvc-dev am: 84ad118843 am: 909e6477bd -s ours am: 8e9ff3d33e -s ours" into rvc-qpr-dev-plus-aosp 2020-05-29 17:21:26 +00:00
Cody Kesting
a1ee2fe3c0 [automerger skipped] Merge "Comment reason for simulateDataStall structure." into rvc-dev am: 84ad118843 am: 909e6477bd -s ours am: 8e9ff3d33e -s ours
am skip reason: Change-Id I751054418bf328c72b977a1cc99c27cb9b8ab7ba with SHA-1 652e3ec4f1 is in history

Change-Id: Ib739972892f4a998246c8070bf92727698d3f7f2
2020-05-29 17:21:17 +00:00
Cody Kesting
8fd21394f6 [automerger skipped] Merge "Comment reason for simulateDataStall structure." into rvc-dev am: 84ad118843 am: 909e6477bd am: 023ea246fe -s ours
am skip reason: Change-Id I751054418bf328c72b977a1cc99c27cb9b8ab7ba with SHA-1 652e3ec4f1 is in history

Change-Id: Ie3cd9207688be27d35fc7ffba152f907118b6fd0
2020-05-29 17:21:08 +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
bcd6b7762c [automerger skipped] Merge "Comment reason for simulateDataStall structure." into rvc-dev am: 84ad118843 -s ours am: 45bc099adc -s ours
am skip reason: Change-Id I751054418bf328c72b977a1cc99c27cb9b8ab7ba with SHA-1 652e3ec4f1 is in history

Change-Id: I0c2984504e0330745d188f2c390aa8b80af53168
2020-05-29 16:58:39 +00:00
Cody Kesting
8e9ff3d33e [automerger skipped] Merge "Comment reason for simulateDataStall structure." into rvc-dev am: 84ad118843 am: 909e6477bd -s ours
am skip reason: Change-Id I751054418bf328c72b977a1cc99c27cb9b8ab7ba with SHA-1 652e3ec4f1 is in history

Change-Id: Ia7169e63e257785e4cd12bf65f01d9f0bc3c7037
2020-05-29 16:58:26 +00:00
Cody Kesting
909e6477bd Merge "Comment reason for simulateDataStall structure." into rvc-dev am: 84ad118843
Change-Id: I6b27cbb174090936f8dfcbe0d82dcdbe387683ee
2020-05-29 16:40:40 +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
b07f7aa332 Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" into rvc-dev am: 51de3f8a10 am: debec6087b am: 18378bce04
Change-Id: I035219d077e990016c6f3cafa07f0f9ec750ea6e
2020-05-29 14:33:07 +00:00
TreeHugger Robot
0d010594e6 Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" into rvc-dev am: 51de3f8a10 am: 76f82ab58f am: 226ff5032d
Change-Id: Idb124d0386088fbdc2732337a8c6f5c53ecaa6b8
2020-05-29 14:32:21 +00:00
TreeHugger Robot
18378bce04 Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" into rvc-dev am: 51de3f8a10 am: debec6087b
Change-Id: I5da0a7fea11a6e78f862e95ae0f246bbadad77dc
2020-05-29 14:20:22 +00:00
TreeHugger Robot
226ff5032d Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" into rvc-dev am: 51de3f8a10 am: 76f82ab58f
Change-Id: If7e0be35ad58b0d4c6a5436a4d6bdd2c7c490ef6
2020-05-29 14:19:49 +00:00
TreeHugger Robot
76f82ab58f Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" into rvc-dev am: 51de3f8a10
Change-Id: I3ab5b7ad875abbe7fe6edcb834bf7d0cb06e5116
2020-05-29 14:09: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
Remi NGUYEN VAN
6642ec61c3 Merge "Allow TRANSPORT_TEST ethernet networks" 2020-05-29 06:26:14 +00:00