Commit Graph

10863 Commits

Author SHA1 Message Date
TreeHugger Robot
be3d759fb5 [automerger skipped] Merge "Update javadoc to use complete sentence" into rvc-dev am: 1f883f9099 -s ours am: 0290fb5b84 -s ours am: a150036ac9 -s ours am: 98c6b0188d -s ours
am skip reason: Change-Id I41bf8a6ddad200f00524d9b2dd1bf169810ee460 with SHA-1 411bb6eb27 is in history

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

Change-Id: I8a1a5cca367f726bc961aa37bb155128e7a9f355
2020-06-08 09:59:30 +00:00
TreeHugger Robot
35e2a17c2e [automerger skipped] Merge "Update javadoc to use complete sentence" into rvc-dev am: 1f883f9099 am: 461c086072 -s ours am: 17a6a1cc27 -s ours am: a0003bb89f -s ours
am skip reason: Change-Id I41bf8a6ddad200f00524d9b2dd1bf169810ee460 with SHA-1 d24c4d2f15 is in history

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

Change-Id: Ic2698e8b85ddb572e849e449d3e6a95a44606913
2020-06-08 09:58:56 +00:00
TreeHugger Robot
98c6b0188d [automerger skipped] Merge "Update javadoc to use complete sentence" into rvc-dev am: 1f883f9099 -s ours am: 0290fb5b84 -s ours am: a150036ac9 -s ours
am skip reason: Change-Id I41bf8a6ddad200f00524d9b2dd1bf169810ee460 with SHA-1 411bb6eb27 is in history

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

Change-Id: I40411dea60aed25d709c8a992e894a25dcb4247b
2020-06-08 09:39:19 +00:00
TreeHugger Robot
a0003bb89f [automerger skipped] Merge "Update javadoc to use complete sentence" into rvc-dev am: 1f883f9099 am: 461c086072 -s ours am: 17a6a1cc27 -s ours
am skip reason: Change-Id I41bf8a6ddad200f00524d9b2dd1bf169810ee460 with SHA-1 d24c4d2f15 is in history

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

Change-Id: Ib6e0fa1ce8201d049ae519ba1272ae84a778f9e9
2020-06-08 09:38:34 +00:00
TreeHugger Robot
a150036ac9 [automerger skipped] Merge "Update javadoc to use complete sentence" into rvc-dev am: 1f883f9099 -s ours am: 0290fb5b84 -s ours
am skip reason: Change-Id I41bf8a6ddad200f00524d9b2dd1bf169810ee460 with SHA-1 411bb6eb27 is in history

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

Change-Id: I4421ce9e02b64caefba7704d666dc2edb5f1bd35
2020-06-08 09:24:22 +00:00
TreeHugger Robot
17a6a1cc27 [automerger skipped] Merge "Update javadoc to use complete sentence" into rvc-dev am: 1f883f9099 am: 461c086072 -s ours
am skip reason: Change-Id I41bf8a6ddad200f00524d9b2dd1bf169810ee460 with SHA-1 d24c4d2f15 is in history

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

Change-Id: I1f6cbe7a8140a67bc58d8a4fbbf9538700596adf
2020-06-08 09:24:01 +00:00
TreeHugger Robot
0290fb5b84 [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 d24c4d2f15 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
TreeHugger Robot
461c086072 Merge "Update javadoc to use complete sentence" into rvc-dev am: 1f883f9099
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11745980

Change-Id: Ic28db88cac7f13c6355eb9ce76cd8cee660c6c93
2020-06-08 09:10:42 +00:00
Treehugger Robot
411bb6eb27 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
8e8051973c Merge "Update javadoc to use complete sentence" am: 1b33b21814 am: 43299a816e am: 1e926eff19 am: e1d18a0e54 am: f9852aea4e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1323953

Change-Id: I558108a3b7f0d33436ee1dbaf6efa9a0ed0a8096
2020-06-05 03:49:26 +00:00
Treehugger Robot
f9852aea4e Merge "Update javadoc to use complete sentence" am: 1b33b21814 am: 43299a816e am: 1e926eff19 am: e1d18a0e54
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
e1d18a0e54 Merge "Update javadoc to use complete sentence" am: 1b33b21814 am: 43299a816e am: 1e926eff19
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
1e926eff19 Merge "Update javadoc to use complete sentence" am: 1b33b21814 am: 43299a816e
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
43299a816e Merge "Update javadoc to use complete sentence" am: 1b33b21814
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
1b33b21814 Merge "Update javadoc to use complete sentence" 2020-06-05 03:02:36 +00:00
Chiachang Wang
80d8b90c49 Merge "Update extra info before registering" am: 004dde17a5 am: 74c9a25719 am: 9e01256b2d am: 5d5f7c80da am: 53c2132bbf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1310538

Change-Id: Idade27520bfda8ca33142c6d2825a504c9cccead
2020-06-05 01:23:59 +00:00
Chiachang Wang
53c2132bbf Merge "Update extra info before registering" am: 004dde17a5 am: 74c9a25719 am: 9e01256b2d am: 5d5f7c80da
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
5d5f7c80da Merge "Update extra info before registering" am: 004dde17a5 am: 74c9a25719 am: 9e01256b2d
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
9e01256b2d Merge "Update extra info before registering" am: 004dde17a5 am: 74c9a25719
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
74c9a25719 Merge "Update extra info before registering" am: 004dde17a5
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
004dde17a5 Merge "Update extra info before registering" 2020-06-05 00:04:04 +00:00
Chiachang Wang
d24c4d2f15 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
Junyu Lai
2d8febc459 [automerger skipped] Merge "Disable log for per uid blocked status changed event" into rvc-dev am: cba8b949b3 -s ours am: ee929416ec -s ours am: 0baad2b5fe -s ours am: cd5479b376 -s ours
am skip reason: Change-Id I04d2b7402f892546722fe6868c521afd9534f183 with SHA-1 7f39b54a36 is in history

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

Change-Id: I51a72cefc4878f275d6e67f0759832a45473ddd8
2020-06-03 07:16:08 +00:00
Junyu Lai
201d8c35b5 [automerger skipped] Merge "Disable log for per uid blocked status changed event" into rvc-dev am: cba8b949b3 am: a21e17ede8 -s ours am: c372c31adb -s ours am: 8f87551abd -s ours
am skip reason: Change-Id I04d2b7402f892546722fe6868c521afd9534f183 with SHA-1 0202567a01 is in history

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

Change-Id: Icfb3785c5fbc2bdc22b9f2614dedabd2b0b7e287
2020-06-03 07:14:10 +00:00
Junyu Lai
cd5479b376 [automerger skipped] Merge "Disable log for per uid blocked status changed event" into rvc-dev am: cba8b949b3 -s ours am: ee929416ec -s ours am: 0baad2b5fe -s ours
am skip reason: Change-Id I04d2b7402f892546722fe6868c521afd9534f183 with SHA-1 7f39b54a36 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
8f87551abd [automerger skipped] Merge "Disable log for per uid blocked status changed event" into rvc-dev am: cba8b949b3 am: a21e17ede8 -s ours am: c372c31adb -s ours
am skip reason: Change-Id I04d2b7402f892546722fe6868c521afd9534f183 with SHA-1 0202567a01 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
0baad2b5fe [automerger skipped] Merge "Disable log for per uid blocked status changed event" into rvc-dev am: cba8b949b3 -s ours am: ee929416ec -s ours
am skip reason: Change-Id I04d2b7402f892546722fe6868c521afd9534f183 with SHA-1 0202567a01 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
c372c31adb [automerger skipped] Merge "Disable log for per uid blocked status changed event" into rvc-dev am: cba8b949b3 am: a21e17ede8 -s ours
am skip reason: Change-Id I04d2b7402f892546722fe6868c521afd9534f183 with SHA-1 0202567a01 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
a21e17ede8 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
ee929416ec [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 0202567a01 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
c9d788a50c 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
Junyu Lai
2454fe79de Merge "Disable log for per uid blocked status changed event" am: 0aad631ab4 am: 3cabc6713f am: be3bc6e50e am: abd4c21b5b am: a10c14b5fa
Original change: undetermined

Change-Id: Iaeb02216ff4375bd04e97d4955c8c08e73a1d4e3
2020-06-02 10:46:13 +00:00
Junyu Lai
a10c14b5fa Merge "Disable log for per uid blocked status changed event" am: 0aad631ab4 am: 3cabc6713f am: be3bc6e50e am: abd4c21b5b
Original change: undetermined

Change-Id: Ib0d04da8d228984ef952f624a830b8d10333d8f4
2020-06-02 10:24:41 +00:00
Junyu Lai
7f39b54a36 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
abd4c21b5b Merge "Disable log for per uid blocked status changed event" am: 0aad631ab4 am: 3cabc6713f am: be3bc6e50e
Original change: undetermined

Change-Id: I841d7042f27b8ef301e69800a7b86d5b5babd3a3
2020-06-02 10:07:37 +00:00
Junyu Lai
be3bc6e50e Merge "Disable log for per uid blocked status changed event" am: 0aad631ab4 am: 3cabc6713f
Original change: undetermined

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

Change-Id: I6ba38a19e1ac1d7f3f3eccef76aa10f75273ca47
2020-06-02 09:52:38 +00:00
Junyu Lai
0aad631ab4 Merge "Disable log for per uid blocked status changed event" 2020-06-02 09:39:30 +00:00
junyulai
0202567a01 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
af44253cdb [automerger skipped] Merge "Allow TRANSPORT_TEST ethernet networks" into rvc-dev am: fcd1fd8f26 am: 59283a0a81 -s ours am: 004bfbd0ec -s ours am: 7a125349ec -s ours
am skip reason: Change-Id I0d9477977c88aa055625ab4046577a41e76b05ff with SHA-1 43b3337094 is in history

Original change: undetermined

Change-Id: Ie6ba18620737d88032da1553a23f8c2f6cd0abba
2020-06-02 00:59:49 +00:00
Remi NGUYEN VAN
a7e1cf0e4f [automerger skipped] Merge "Allow TRANSPORT_TEST ethernet networks" into rvc-dev am: fcd1fd8f26 -s ours am: 1a0e734016 -s ours am: 56f8102e80 -s ours am: d1a85ede0b -s ours
am skip reason: Change-Id I0d9477977c88aa055625ab4046577a41e76b05ff with SHA-1 d64d6c3e98 is in history

Original change: undetermined

Change-Id: Ie85035aa3118674bd5351cd03eae944b21c2702e
2020-06-02 00:59:13 +00:00
Remi NGUYEN VAN
7a125349ec [automerger skipped] Merge "Allow TRANSPORT_TEST ethernet networks" into rvc-dev am: fcd1fd8f26 am: 59283a0a81 -s ours am: 004bfbd0ec -s ours
am skip reason: Change-Id I0d9477977c88aa055625ab4046577a41e76b05ff with SHA-1 43b3337094 is in history

Original change: undetermined

Change-Id: I34e837a2d2845d3a61196190ec066b3a11c75f53
2020-06-02 00:53:22 +00:00
Remi NGUYEN VAN
004bfbd0ec [automerger skipped] Merge "Allow TRANSPORT_TEST ethernet networks" into rvc-dev am: fcd1fd8f26 am: 59283a0a81 -s ours
am skip reason: Change-Id I0d9477977c88aa055625ab4046577a41e76b05ff with SHA-1 43b3337094 is in history

Original change: undetermined

Change-Id: Id6ad7c1d429a0c9804e8adaf1b679436bfd20c27
2020-06-02 00:41:38 +00:00
Remi NGUYEN VAN
d1a85ede0b [automerger skipped] Merge "Allow TRANSPORT_TEST ethernet networks" into rvc-dev am: fcd1fd8f26 -s ours am: 1a0e734016 -s ours am: 56f8102e80 -s ours
am skip reason: Change-Id I0d9477977c88aa055625ab4046577a41e76b05ff with SHA-1 d64d6c3e98 is in history

Original change: undetermined

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

Original change: undetermined

Change-Id: I821ea2b89e5c81e3b2524d23a4f80dbdd42fadf4
2020-06-02 00:33:33 +00:00
Remi NGUYEN VAN
59283a0a81 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
1a0e734016 [automerger skipped] Merge "Allow TRANSPORT_TEST ethernet networks" into rvc-dev am: fcd1fd8f26 -s ours
am skip reason: Change-Id I0d9477977c88aa055625ab4046577a41e76b05ff with SHA-1 d64d6c3e98 is in history

Original change: undetermined

Change-Id: I4b1233d27e377981cea021dc383a5b1b43dfcb8c
2020-06-02 00:24:45 +00:00
Maciej Żenczykowski
3e988fa82c [automerger skipped] Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" am: 4423b79af3 am: 02a2410340 -s ours am: abe54fb52f -s ours am: 8cf31a233a -s ours am: 10b7699fdd -s ours
am skip reason: Change-Id Iea0c2488dcabdd24d6ffca8134cd11ed12e8308a with SHA-1 2d0874ca05 is in history

Change-Id: I18747b97ed33dff73c95cb1f79875b1d40e305bd
2020-06-01 03:09:53 +00:00
Maciej Żenczykowski
10b7699fdd [automerger skipped] Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" am: 4423b79af3 am: 02a2410340 -s ours am: abe54fb52f -s ours am: 8cf31a233a -s ours
am skip reason: Change-Id Iea0c2488dcabdd24d6ffca8134cd11ed12e8308a with SHA-1 2d0874ca05 is in history

Change-Id: I262105a96dbdf96a6fe9527f256f407b255d5560
2020-06-01 02:48:30 +00:00
Maciej Żenczykowski
8cf31a233a [automerger skipped] Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" am: 4423b79af3 am: 02a2410340 -s ours am: abe54fb52f -s ours
am skip reason: Change-Id Iea0c2488dcabdd24d6ffca8134cd11ed12e8308a with SHA-1 2d0874ca05 is in history

Change-Id: Ic02c533761d63b970a7fa094b9d25e0ccb1bbcd0
2020-06-01 02:37:12 +00:00