Commit Graph

10455 Commits

Author SHA1 Message Date
Mark Chien
aca0fb2154 Merge "Cleanup config_mobile_hotspot_provision_app usage" am: 443092b9a8 am: 921d8c0fb5 am: b4e92e60f1 am: fc6fc7a9a1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329014

Change-Id: I8e0fc83e9a3ed7eeb01e7caf761a3b206dc026bd
2020-06-11 08:37:55 +00:00
Mark Chien
fc6fc7a9a1 Merge "Cleanup config_mobile_hotspot_provision_app usage" am: 443092b9a8 am: 921d8c0fb5 am: b4e92e60f1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329014

Change-Id: I46278552c5b9f2cbe251aae7cd007041877dc494
2020-06-11 08:25:19 +00:00
Mark Chien
b4e92e60f1 Merge "Cleanup config_mobile_hotspot_provision_app usage" am: 443092b9a8 am: 921d8c0fb5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329014

Change-Id: Ib3bb0129419ffd55df6c2c53cce3ad7e9155e854
2020-06-11 08:03:56 +00:00
Mark Chien
921d8c0fb5 Merge "Cleanup config_mobile_hotspot_provision_app usage" am: 443092b9a8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329014

Change-Id: I3d265ab9806605e18384fa6321452f7c96f3f48b
2020-06-11 07:40:27 +00:00
Automerger Merge Worker
c31611539b Merge "[automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 4720606b02 am: e709bb9955 -s ours" into rvc-d1-dev-plus-aosp am: 4012dc903f -s ours
am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 d33028c205 is in history

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

Change-Id: Iac524d19a8a357a3248368a4bfe15ffa668cdb1e
2020-06-10 16:03:24 +00:00
Lorenzo Colitti
fadb20c9f6 [automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 4720606b02 -s ours am: e7a3528bbf -s ours am: 4cb28f9cc1 -s ours
am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 d33028c205 is in history

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

Change-Id: I24f4975c818a6857feee0082245bfb33af3911ff
2020-06-10 16:01:56 +00:00
Lorenzo Colitti
a9adebaafa [automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 4720606b02 am: e709bb9955 am: c889bb9a83 -s ours
am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 9774ceb3ea is in history

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

Change-Id: Ib3fb4af9b39f9497b0cbf9cb327cc5941b7dd7ac
2020-06-10 15:55:58 +00:00
markchien
e9aad6fa2b Cleanup config_mobile_hotspot_provision_app usage
config_mobile_hotspot_provision_app would be move out of framework and
only private for tethering only.
enforceTetherChangePermission is no longer needed because its only
caller PanService already gate by other privileged permission
(BLUETOOTH_PRIVILEGED).

Bug: 146918263
Test: m

Change-Id: I030871c2bc46bc09c4e52970b4995f98d31bb90e
2020-06-10 15:52:24 +00:00
Automerger Merge Worker
4012dc903f Merge "[automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 4720606b02 am: e709bb9955 -s ours" into rvc-d1-dev-plus-aosp 2020-06-10 15:45:11 +00:00
Lorenzo Colitti
c90a672da8 [automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 4720606b02 am: e709bb9955 -s ours
am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 9774ceb3ea is in history

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

Change-Id: I88b0cfec19209ee77b3d98e67eda1100e13f156a
2020-06-10 15:45:06 +00:00
Lorenzo Colitti
4cb28f9cc1 [automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 4720606b02 -s ours am: e7a3528bbf -s ours
am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 9774ceb3ea is in history

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

Change-Id: I9a58214b06884b92dde316a9c554b9ebcf500604
2020-06-10 15:45:01 +00:00
Lorenzo Colitti
e7a3528bbf [automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 4720606b02 -s ours
am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 9774ceb3ea is in history

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

Change-Id: Iee50671a7363ed0e820494cbbb06b71063d01f6a
2020-06-10 15:33:04 +00:00
Lorenzo Colitti
e709bb9955 Merge "Update extra info before registering" into rvc-dev am: 4720606b02
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11745979

Change-Id: I7b68541f2cf1b3367b5aa6b6221b636f54c2e53e
2020-06-10 15:32:55 +00:00
Lorenzo Colitti
4720606b02 Merge "Update extra info before registering" into rvc-dev 2020-06-10 15:17:38 +00:00
Xin Li
79808eb585 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 551b6e094b -s ours am: 8c453bdce0 -s ours am: e0a1ab503c -s ours am: 929d9468b8 -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: Id2777f3b97ff4733dfda185b8feceb4cc25330bc
2020-06-08 16:42:05 +00:00
Xin Li
929d9468b8 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 551b6e094b -s ours am: 8c453bdce0 -s ours am: e0a1ab503c -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: Ie30658c18424bb30696876b4b4a103fe1c645ab7
2020-06-08 16:29:22 +00:00
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
b9befc7cef [automerger skipped] Merge "Update javadoc to use complete sentence" into rvc-dev am: 1f883f9099 -s ours am: a29f7baa7b -s ours am: c04a06a900 -s ours
am skip reason: Change-Id I41bf8a6ddad200f00524d9b2dd1bf169810ee460 with SHA-1 9d2a21503b 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
7d36d7c38d [automerger skipped] Merge "Update javadoc to use complete sentence" into rvc-dev am: 1f883f9099 am: 5a1fcd7990 -s ours am: 164ddad161 -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: Ib6e0fa1ce8201d049ae519ba1272ae84a778f9e9
2020-06-08 09:38:34 +00:00
TreeHugger Robot
c04a06a900 [automerger skipped] Merge "Update javadoc to use complete sentence" into rvc-dev am: 1f883f9099 -s ours am: a29f7baa7b -s ours
am skip reason: Change-Id I41bf8a6ddad200f00524d9b2dd1bf169810ee460 with SHA-1 9d2a21503b 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
164ddad161 [automerger skipped] Merge "Update javadoc to use complete sentence" into rvc-dev am: 1f883f9099 am: 5a1fcd7990 -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: I1f6cbe7a8140a67bc58d8a4fbbf9538700596adf
2020-06-08 09:24:01 +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
TreeHugger Robot
5a1fcd7990 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
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
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
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
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