Commit Graph

10847 Commits

Author SHA1 Message Date
Aaron Huang
2070880fab Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 70afc75769
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
65556318aa Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 70afc75769
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
70afc75769 Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev 2020-06-12 01:58:59 +00:00
android-build-team Robot
b5926e69c5 Snap for 6582636 from 5c71678253626384497367f67c2a17f045485921 to rvc-release
Change-Id: I58bbd14c18bdd555bf30da5fbe16d2d9df033454
2020-06-12 01:09:56 +00:00
Chalard Jean
cece40543e 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
Original-Change: https://android-review.googlesource.com/1313813
Merged-In: I5911d01984695550b6c9afe7a8eb535bf5e320a1
Change-Id: I5911d01984695550b6c9afe7a8eb535bf5e320a1
2020-06-12 00:35:39 +00:00
Mark Chien
e063ebdd7f [automerger skipped] Merge "Cleanup config_mobile_hotspot_provision_app usage" into rvc-dev am: ef24e2121d am: bd60308b8f -s ours
am skip reason: Change-Id I030871c2bc46bc09c4e52970b4995f98d31bb90e with SHA-1 f949ec251f 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
0a35a27bc4 [automerger skipped] Merge "Cleanup config_mobile_hotspot_provision_app usage" into rvc-dev am: ef24e2121d -s ours am: 977a7aa9db -s ours
am skip reason: Change-Id I030871c2bc46bc09c4e52970b4995f98d31bb90e with SHA-1 e9aad6fa2b 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
bd60308b8f 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
977a7aa9db [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 e9aad6fa2b 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
f949ec251f 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
ad6fb4921b Merge "Document the limitation to a hundred callbacks." am: f60ed54d33 am: 363fb9fef9 am: 1fa0eab021
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
1fa0eab021 Merge "Document the limitation to a hundred callbacks." am: f60ed54d33 am: 363fb9fef9
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
363fb9fef9 Merge "Document the limitation to a hundred callbacks." am: f60ed54d33
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
f60ed54d33 Merge "Document the limitation to a hundred callbacks." 2020-06-11 12:31:09 +00:00
Chalard Jean
a5ff113bff 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
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
android-build-team Robot
cf4404ac33 Make change and version bump to r_aml_300801300 for mainline module file: packages/Tethering/apex/manifest.json
Change-Id: Ia261164ce399e211f9136fa36b6d28f9aea918d1
2020-06-11 07:16:12 +00:00
android-build-team Robot
bb3c76bbc5 Snap for 6578268 from 11b584739778d1b86235c5ba844652adc438c842 to rvc-release
Change-Id: Ie92c8ccd61e1a1d06c1f5ace09067fe398bcaaa1
2020-06-11 01:08:47 +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
android-build-team Robot
b50cfcec3d Make change and version bump to r_aml_300801100 for mainline module file: packages/Tethering/apex/manifest.json
Change-Id: I06126d269aa431f5c9f6cd38f403ddfd3f12d489
2020-06-09 07:17:51 +00:00
android-build-team Robot
adf81959c7 Snap for 6570104 from 31b2931b9f8009629f4010434f8eeada4757df71 to rvc-release
Change-Id: Ia1317fb0597642ef5e323ad9826dee47ba85958c
2020-06-09 01:09:58 +00:00
Benedict Wong
bf004e9830 Set correct owner UID for VPN agentConnect()
This commit changes agentConnect to set the owner UID as the mOwnerUid
field instead of the Binder.getCallingUid().

Binder.getCallingUid() can return incorrect results for platform VPNs,
as agentConnect() is called under a clean calling UID.

Additionally, this relaxes the ownerUid sanitization check to allow a
VPN network's owner to see it's own ownership information.

Vpn.mOwnerUid is guaranteed to be correct, as all VPNs MUST have called
prepareInternal() at some previous point, which sets mOwnerUid as the
package's UID (or SYSTEM_UID if this is legacy VPN).

Bug: 150135470
Test: CTS tests showing ownership information
Change-Id: Ic979dad73983d722365849fbfb0becfd432b894c
2020-06-08 14:33:01 -07:00
Aaron Huang
a8eab54eee 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
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
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
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
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