Remi NGUYEN VAN
f4ae885dbd
Merge "Revert "Note network interfaces based on transport""
2021-01-26 04:25:56 +00:00
Remi NGUYEN VAN
f9054ed6bd
Revert "Note network interfaces based on transport"
...
This reverts commit 6e1b16c9fe .
Reason for revert: Broke build of tests: b/178441996
Change-Id: Idaf35fa02f76852fa8134b0d505467007f6d0f60
2021-01-26 04:22:54 +00:00
Remi NGUYEN VAN
5e420d9ef4
Merge "Note network interfaces based on transport"
2021-01-26 03:20:21 +00:00
Daniel Bright
946f6661c2
Merge "Add method to match address \ port with QosFilter" am: 591fe5327c am: c6e47cad53 am: 22b01d88ca
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1510591
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id9951a0be8821192e3fb403787d096c538d691cf
2021-01-26 00:22:58 +00:00
Daniel Bright
22b01d88ca
Merge "Add method to match address \ port with QosFilter" am: 591fe5327c am: c6e47cad53
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1510591
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I31b6fc16a31c45a9f44dc90872fd1b1fc03fcc14
2021-01-26 00:04:11 +00:00
Daniel Bright
c6e47cad53
Merge "Add method to match address \ port with QosFilter" am: 591fe5327c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1510591
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1ccdf5afb966d44852ea34f7d3284470f002e539
2021-01-25 18:40:06 +00:00
Will Osborn
c61f3c3848
Merge "Revert "Replace Context#sendStickyBroadcastAsUser()"" am: 42a9366c6f am: 5f323ee65b am: 5720e85c3d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556090
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6e347ed000fcec2a67047211fad81cae12de054c
2021-01-25 18:26:50 +00:00
Will Osborn
5720e85c3d
Merge "Revert "Replace Context#sendStickyBroadcastAsUser()"" am: 42a9366c6f am: 5f323ee65b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556090
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3583681f6982933c855e12583a60c4c000d6a6fa
2021-01-25 18:06:14 +00:00
Daniel Bright
591fe5327c
Merge "Add method to match address \ port with QosFilter"
2021-01-25 18:03:32 +00:00
Will Osborn
5f323ee65b
Merge "Revert "Replace Context#sendStickyBroadcastAsUser()"" am: 42a9366c6f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556090
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idf3590c2457434fb10ed68213ff47e5c8fffb4d7
2021-01-25 17:35:21 +00:00
Will Osborn
42a9366c6f
Merge "Revert "Replace Context#sendStickyBroadcastAsUser()""
2021-01-25 17:20:29 +00:00
Will Osborn
3eaba31d42
Revert "Replace Context#sendStickyBroadcastAsUser()"
...
This reverts commit c529710329 .
Reason for revert: DroidMonitor: Potential culprit for Bug http://b/178367782 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Change-Id: I7fd74bf481febf1cba8b6c8fbf01c4908f847606
2021-01-25 14:34:30 +00:00
Paul Hu
e371dcf727
Merge "Replace Context#sendStickyBroadcastAsUser()" am: 0a6682146c am: 2c7d1107f9 am: 110dff506a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552316
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0580d039740e0c9e4665d1cb1aef581935d7e57c
2021-01-25 07:13:08 +00:00
Paul Hu
110dff506a
Merge "Replace Context#sendStickyBroadcastAsUser()" am: 0a6682146c am: 2c7d1107f9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552316
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8e2eb504f76b3cb0e9a3125144f591666b2a6b59
2021-01-25 06:57:48 +00:00
Paul Hu
2c7d1107f9
Merge "Replace Context#sendStickyBroadcastAsUser()" am: 0a6682146c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552316
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia48990908b46f3e686b3798850a0f955a2f81dd1
2021-01-25 06:27:36 +00:00
Paul Hu
0a6682146c
Merge "Replace Context#sendStickyBroadcastAsUser()"
2021-01-25 05:57:22 +00:00
Paul Hu
f144bd68f4
Merge "Replace NetworkPolicyManagerInternal#isUidRestrictedOnMeteredNetworks()" am: 85aad57203 am: 12fbbf4145 am: ffb5aa3fc3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534910
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie09f19ae607041e94a6e6bbce3f745d7ca868201
2021-01-22 15:53:48 +00:00
Paul Hu
ffb5aa3fc3
Merge "Replace NetworkPolicyManagerInternal#isUidRestrictedOnMeteredNetworks()" am: 85aad57203 am: 12fbbf4145
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534910
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I53d02efcb85b72671dcd89acf917518a53049b11
2021-01-22 15:21:54 +00:00
Paul Hu
12fbbf4145
Merge "Replace NetworkPolicyManagerInternal#isUidRestrictedOnMeteredNetworks()" am: 85aad57203
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534910
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0f8833a502cfa4674190509300eb378c4072efcc
2021-01-22 14:53:33 +00:00
Chalard Jean
04ba35dc06
Merge "Add Qos Callback support" am: 29f0f6d47f am: b97f23ae96 am: f14671c09a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386623
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If0a123f16951c88cc5881fba8865fae822ba92f0
2021-01-22 14:52:58 +00:00
Chalard Jean
1cfa730fc1
Merge "Add Qos Callback files" am: a96f7a4d89 am: f884ddbf97 am: 79d0ad5f2f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1557008
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2230e75cf710d5c9203eca741bb6abb662c96bbc
2021-01-22 14:52:28 +00:00
Daniel Bright
07dd129bbe
Add method to match address \ port with QosFilter
...
* The match method is only for local address and port since we have
no other use case.
Bug: 155176305
Test: Added new test
Change-Id: I7b45f9912af6a192fc60606f5e0b4cc479aea93f
2021-01-22 06:24:41 -08:00
Paul Hu
85aad57203
Merge "Replace NetworkPolicyManagerInternal#isUidRestrictedOnMeteredNetworks()"
2021-01-22 14:18:47 +00:00
Chalard Jean
f14671c09a
Merge "Add Qos Callback support" am: 29f0f6d47f am: b97f23ae96
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386623
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1d07d8e5bd5e0a40df7d7fa276bf0c1fed500ed1
2021-01-22 14:17:50 +00:00
Chalard Jean
79d0ad5f2f
Merge "Add Qos Callback files" am: a96f7a4d89 am: f884ddbf97
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1557008
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1000035eb541c666d193a36647e7070647d3248a
2021-01-22 14:17:18 +00:00
Chalard Jean
b97f23ae96
Merge "Add Qos Callback support" am: 29f0f6d47f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386623
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I73984d62a914a4d96ed116c3c25ebdce7e6426ea
2021-01-22 13:41:39 +00:00
Chalard Jean
f884ddbf97
Merge "Add Qos Callback files" am: a96f7a4d89
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1557008
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I63e1639172bde1ffd498605b9d1a43633cc8a623
2021-01-22 13:31:16 +00:00
Chalard Jean
29f0f6d47f
Merge "Add Qos Callback support"
2021-01-22 13:09:24 +00:00
Chalard Jean
a96f7a4d89
Merge "Add Qos Callback files"
2021-01-22 13:06:43 +00:00
Remi NGUYEN VAN
066b792d54
Merge "Mark connectivity test utilities as module API" am: 5ef8031d57 am: a9630d29d0 am: 9dce262648
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547643
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3537f92a718d8494234e698df20b535383dc8e90
2021-01-22 11:35:33 +00:00
Remi NGUYEN VAN
9dce262648
Merge "Mark connectivity test utilities as module API" am: 5ef8031d57 am: a9630d29d0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547643
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I10d521b26061821ab1ee57d1938416163d93de92
2021-01-22 11:12:11 +00:00
Remi NGUYEN VAN
a9630d29d0
Merge "Mark connectivity test utilities as module API" am: 5ef8031d57
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547643
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5973e19d7b7a103235121f5efc1951985e3a4c41
2021-01-22 10:34:16 +00:00
Remi NGUYEN VAN
5ef8031d57
Merge "Mark connectivity test utilities as module API"
2021-01-22 10:11:39 +00:00
paulhu
76cf0c5c8e
Replace NetworkPolicyManagerInternal#isUidRestrictedOnMeteredNetworks()
...
Connectivity service is going to become a mainline module which
will not able to access hidden APIs. NetworkPolicyManagerInternal
is a internal serivce that CS can't be access after be a mainline
module. Thus, create NPMS#isUidRestrictedOnMeteredNetworks() and
NPM#isUidRestrictedOnMeteredNetworks() to replace
NPMI#isUidRestrictedOnMeteredNetworks().
Also correct the permission check in isUidNetworkingBlocked()
that needs to check OBSERVE_NETWORK_POLICY only.
Bug: 170598012
Test: atest FrameworksNetTests
Test: atest FrameworksCoreTests:NetworkPolicyManagerTest
Test: atest FrameworksServicesTests:NetworkPolicyManagerServiceTest
Test: atest CtsNetTestCases
Test: atest CtsHostsideNetworkTests
Change-Id: I5801a3a2076f3eb199a0226c38c85014b26c64e7
2021-01-22 16:14:28 +08:00
Remi NGUYEN VAN
7d4530b98d
Mark connectivity test utilities as module API
...
The API surface is planned to move to the Connectivity module, meaning
that it will be maintained across multiple Android releases.
This is incompatible with TestApi semantics, which are designed to be
removable across releases. Effectively the APIs become SystemApi, so
mark them as such considering that TestApi is not supported by modules.
Remove the NetworkCapabilities.getCapabilities test API that is not
essential for tests, and mark other APIs as module API.
Test: m
Bug: 174436414
Change-Id: Ic04551a9874b3d756cf5e6c77ceabfc7c85d52a6
2021-01-22 16:16:57 +09:00
Daniel Bright
60f02ed76b
Add Qos Callback support
...
* Provide App Developers Qos related info associated to
a bound socket through ConnectivityManager
* Qos sessions are generated and filtered by Network Agents
and sent back through the Connectivity Service to the
API consumer.
* The structure of the code within com.android.server
is designed to support different types of filters in the
the future.
* The first type of Qos Attributes are related to EPS
Bearers in order support RCS.
Bug: 155176305
Test: Added to cts/NetworkAgentTest
Test: Added to ConnectivityServiceTest
Change-Id: I145dd065d9deeee449eb9695ab3f6c8556ee7c09
2021-01-21 20:14:52 -08:00
Daniel Bright
53f0e44449
Add Qos Callback files
...
* Add QosCallback stub files
Bug: 155176305
Test: N/A
Change-Id: I7c231d60880c37ae1ce49fa8a621badf386ab8a7
2021-01-21 19:50:24 -08:00
Remi NGUYEN VAN
2de4515158
Merge "Use network list in UNDERLYING_NETWORKS_CHANGED" am: a6f4de3432 am: ef75b38a4d am: 599b2b1d17
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536308
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I28e3fc36dd42316f3cc618c29d610a02ffad8722
2021-01-22 02:31:40 +00:00
Remi NGUYEN VAN
599b2b1d17
Merge "Use network list in UNDERLYING_NETWORKS_CHANGED" am: a6f4de3432 am: ef75b38a4d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536308
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1458448db36acce05cad6ba9f41b4d7d11bc684a
2021-01-22 01:47:51 +00:00
Remi NGUYEN VAN
ef75b38a4d
Merge "Use network list in UNDERLYING_NETWORKS_CHANGED" am: a6f4de3432
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536308
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I58184fe4f731319b7bf4c8cf24c0a6571e4a1d8b
2021-01-22 01:22:25 +00:00
Remi NGUYEN VAN
d793eb34ca
Use network list in UNDERLYING_NETWORKS_CHANGED
...
The bundle is no longer necessary, as this message is not sent across
processes: the network list can be sent directly in the message obj
pair.
Bug: 173574274
Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Change-Id: Iae049a24212ff9df19b29aead20bf4a594f05f99
2021-01-21 22:36:54 +09:00
Chiachang Wang
b823312030
Merge "[IT4.4] Host network activity related logic into a new class" am: 18e77a4752 am: d2258450d1 am: 766be66a93
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534899
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2a11342e5659222113955ab0d5b713aecac03707
2021-01-21 10:29:03 +00:00
Chiachang Wang
766be66a93
Merge "[IT4.4] Host network activity related logic into a new class" am: 18e77a4752 am: d2258450d1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534899
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia9d356627445c81993ba4ed2048d621e70ebca0e
2021-01-21 10:01:05 +00:00
Chiachang Wang
6443ace807
Merge "Use ParcelFileDescriptor instead of FileDescriptor in the aidl" am: 0ad97bf744 am: 8178ec8ea2 am: 9d49128dc9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554098
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8c873db971acd19cba9dd45a874e036587f88940
2021-01-21 09:25:51 +00:00
Chiachang Wang
d2258450d1
Merge "[IT4.4] Host network activity related logic into a new class" am: 18e77a4752
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534899
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6158f29302241703367b5392d2f0adcf6f6ccf57
2021-01-21 09:21:33 +00:00
Chiachang Wang
9d49128dc9
Merge "Use ParcelFileDescriptor instead of FileDescriptor in the aidl" am: 0ad97bf744 am: 8178ec8ea2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554098
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If57e12227a2735853911ca6271a211571ddb633b
2021-01-21 09:19:46 +00:00
Paul Hu
010f5749d8
Merge "Replace Context @hide API in MultinetworkPolicyTracker" am: 161e0b9b78 am: 0b1c92d785 am: 39400248ea
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554096
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibf4d66456d3b3675d16a80b1538949c3807ddcbc
2021-01-21 09:18:45 +00:00
Paul Hu
39400248ea
Merge "Replace Context @hide API in MultinetworkPolicyTracker" am: 161e0b9b78 am: 0b1c92d785
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554096
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib68e5eb2ce60a616b25b6d0a45b2af143660865f
2021-01-21 08:55:37 +00:00
Chiachang Wang
8178ec8ea2
Merge "Use ParcelFileDescriptor instead of FileDescriptor in the aidl" am: 0ad97bf744
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554098
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9b7818c5fc851a5b2a1406caec0db3dac3ff55c7
2021-01-21 08:55:33 +00:00
Chiachang Wang
18e77a4752
Merge "[IT4.4] Host network activity related logic into a new class"
2021-01-21 08:41:15 +00:00