Commit Graph

10215 Commits

Author SHA1 Message Date
Automerger Merge Worker
fdb090db84 Merge "Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 4ca7d588b4 am: 7150252ba4" into rvc-d1-dev-plus-aosp 2020-06-12 02:20:40 +00:00
Aaron Huang
af9bb5c215 Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 4ca7d588b4 am: 7150252ba4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484

Change-Id: I0e5b064f0633474c5200ecf4620540e883af5d0b
2020-06-12 02:20:15 +00:00
Aaron Huang
15a62ea56f Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 4ca7d588b4 am: a0e48b1df5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484

Change-Id: I7c557b81d3e5ac35b7e8559d8f5d4f5e0d29236a
2020-06-12 02:19:55 +00:00
Aaron Huang
a0e48b1df5 Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 4ca7d588b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484

Change-Id: I43328c82223382978ac3475a195011547f6d0fdc
2020-06-12 02:11:58 +00:00
Aaron Huang
7150252ba4 Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 4ca7d588b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484

Change-Id: Iac633487b359d751206e06b2352a2a9cb475811e
2020-06-12 02:11:29 +00:00
Aaron Huang
4ca7d588b4 Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev 2020-06-12 01:58:59 +00:00
Mark Chien
ce195ed89f [automerger skipped] Merge "Cleanup config_mobile_hotspot_provision_app usage" into rvc-dev am: ef24e2121d am: a86848082f -s ours
am skip reason: Change-Id I030871c2bc46bc09c4e52970b4995f98d31bb90e with SHA-1 958263cad9 is in history

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

Change-Id: I9d40c0e0998d238bcde75a1417f1dbac384285d7
2020-06-11 15:45:34 +00:00
Mark Chien
74fa5a8438 [automerger skipped] Merge "Cleanup config_mobile_hotspot_provision_app usage" into rvc-dev am: ef24e2121d -s ours am: 415e13cd58 -s ours
am skip reason: Change-Id I030871c2bc46bc09c4e52970b4995f98d31bb90e with SHA-1 11f729b0b5 is in history

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

Change-Id: Ib9adc3d5bff3f75a2472ecef958a66d582fd9a97
2020-06-11 15:43:01 +00:00
Mark Chien
a86848082f Merge "Cleanup config_mobile_hotspot_provision_app usage" into rvc-dev am: ef24e2121d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716092

Change-Id: Iece352be0190b902c4949c1feb76281653a9b59f
2020-06-11 15:42:41 +00:00
Mark Chien
415e13cd58 [automerger skipped] Merge "Cleanup config_mobile_hotspot_provision_app usage" into rvc-dev am: ef24e2121d -s ours
am skip reason: Change-Id I030871c2bc46bc09c4e52970b4995f98d31bb90e with SHA-1 11f729b0b5 is in history

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

Change-Id: I03e5cf0b7950726825c781dda3b5efdc613e2dcf
2020-06-11 15:42:35 +00:00
markchien
958263cad9 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
Merged-In: I030871c2bc46bc09c4e52970b4995f98d31bb90e
2020-06-11 13:32:12 +00:00
Chalard Jean
06ee0240a7 Merge "Document the limitation to a hundred callbacks." am: 665d54db52 am: 1baaf76e55 am: 8534af7ed5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313813

Change-Id: Ie9f8c65c307cbefb6e95ec0d3099e5da875ff1c2
2020-06-11 13:16:54 +00:00
Chalard Jean
8534af7ed5 Merge "Document the limitation to a hundred callbacks." am: 665d54db52 am: 1baaf76e55
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313813

Change-Id: I84b1e39503feddc914b61d4e8bd35953e92ac270
2020-06-11 13:03:37 +00:00
Chalard Jean
1baaf76e55 Merge "Document the limitation to a hundred callbacks." am: 665d54db52
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313813

Change-Id: Id2f70609c46ec6252b7e734c1e5838016314400f
2020-06-11 12:46:15 +00:00
Chalard Jean
665d54db52 Merge "Document the limitation to a hundred callbacks." 2020-06-11 12:31:09 +00:00
Chalard Jean
7f06b34acd Document the limitation to a hundred callbacks.
Some developers have been surprised by this limitation and had trouble
figuring out what the issue was. Add documentation to address this.

This also includes a drive-by removal of a duplicate check.

Bug: 149867479
Test: doc-only change
Change-Id: I5911d01984695550b6c9afe7a8eb535bf5e320a1
2020-06-11 12:30:21 +00:00
Mark Chien
e80f74f29e Merge "Cleanup config_mobile_hotspot_provision_app usage" am: 443092b9a8 am: 4c645dd681 am: ba41c9cef1
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
ba41c9cef1 Merge "Cleanup config_mobile_hotspot_provision_app usage" am: 443092b9a8 am: 4c645dd681
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
4c645dd681 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
markchien
11f729b0b5 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
567a9ed4de Merge "[automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 9d6f1bf413 am: 34d90e3fc7 -s ours" into rvc-d1-dev-plus-aosp 2020-06-10 15:45:11 +00:00
Lorenzo Colitti
0e42bfcc60 [automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 9d6f1bf413 am: 34d90e3fc7 -s ours
am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 c9d788a50c 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
9fdb7018d5 [automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 9d6f1bf413 -s ours am: 0a059084a0 -s ours
am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 c9d788a50c 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
0a059084a0 [automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 9d6f1bf413 -s ours
am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 c9d788a50c 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
34d90e3fc7 Merge "Update extra info before registering" into rvc-dev am: 9d6f1bf413
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
9d6f1bf413 Merge "Update extra info before registering" into rvc-dev 2020-06-10 15:17:38 +00:00
Aaron Huang
f0ada3725f Add unit test for NetworkStatsSubscriptionsMonitor
Bug: 154080205
Test: atest FrameworksNetTests:com.android.server.net.NetworkStatsSubscriptionsMonitorTest
Change-Id: I4ef3f1ab2e5ea1322133edd80db3ccd0022e9c91
2020-06-09 00:40:36 +08:00
Xin Li
36755c11bc [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: a346d8259f -s ours am: 82dfa8f215 -s ours am: 00a6331941 -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
00a6331941 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: a346d8259f -s ours am: 82dfa8f215 -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
82dfa8f215 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: a346d8259f -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
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
Xin Li
a346d8259f Merge "Merge QQ3A.200605.002 into master" 2020-06-06 01:41:11 +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
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
d4f8954b27 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
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
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