Commit Graph

12707 Commits

Author SHA1 Message Date
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
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
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
Chiachang Wang
0ad97bf744 Merge "Use ParcelFileDescriptor instead of FileDescriptor in the aidl" 2021-01-21 08:40:53 +00:00
Chiachang Wang
979f46a693 Use ParcelFileDescriptor instead of FileDescriptor in the aidl
Using FileDescriptor in the aidl will refer to
Parcel.readRawFileDescriptor() and Parcel.writeRawFileDescriptor()
whilie trying to do parcel operations. Those two APIs are hidden
and not accessible for the incoming ConnectivityService mainline
module. For such use cases in a module, it should be replaced by
using ParcelFileDescriptor that is designed for such usages.

Bug: 170598012
Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Change-Id: Ia7e3a71ccb4b136cc55c9e90a384870c32cfd37b
2021-01-21 08:40:12 +00:00
Paul Hu
0b1c92d785 Merge "Replace Context @hide API in MultinetworkPolicyTracker" am: 161e0b9b78
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554096

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33f441fba920d6228be47b2025fcf7303e496da8
2021-01-21 08:07:51 +00:00
Paul Hu
161e0b9b78 Merge "Replace Context @hide API in MultinetworkPolicyTracker" 2021-01-21 07:53:19 +00:00
Remi NGUYEN VAN
75ac6c42a1 Merge "Mark TestNetworkManager as module API" am: cc041a72e7 am: 4bfba0d2e1 am: 45d22e4ccc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547638

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a8aa17d6acdaed8ee7419990493b631c0eb6d1c
2021-01-21 07:28:46 +00:00
Remi NGUYEN VAN
45d22e4ccc Merge "Mark TestNetworkManager as module API" am: cc041a72e7 am: 4bfba0d2e1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547638

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I363b288609514251f1e5ec337f56368180d2b259
2021-01-21 06:59:55 +00:00
lucaslin
6d502ed79d [IT4.4] Host network activity related logic into a new class
Create an inner class to handle the network activity related
logic to isolate the code for code cleanliness. It's helpful for
the follow-up modifications to move network activity logic from
NMS to CS to support Connectivityservice mainline.

Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: I33b3b11f2700cb10eb6e3b58b6dfa52251bece80
2021-01-21 06:27:23 +00:00
Remi NGUYEN VAN
4bfba0d2e1 Merge "Mark TestNetworkManager as module API" am: cc041a72e7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547638

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1677f8f4fa436450ebc4d83cc10ff8503f2f9f2
2021-01-21 06:22:58 +00:00
Remi NGUYEN VAN
cc041a72e7 Merge "Mark TestNetworkManager as module API" 2021-01-21 06:02:25 +00:00
Remi NGUYEN VAN
5eee3ec919 Mark TestNetworkManager 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 System/module
API, so mark them as such considering that TestApi is not supported by
modules.

Test: m
Bug: 174436414
Change-Id: Icd32fcbb65e9a4bb2b67cb9da7c971281be0781a
2021-01-21 10:45:04 +09:00
paulhu
fd8dac4fe5 Replace Context @hide API in MultinetworkPolicyTracker
MultinetworkPolicyTracker is part of Connectivity mainline module
which cannot call @hide API Context#registerReceiverAsUser. Thus,
replace it to Context#registerReceiverForAllUsers.

Bug: 170634463
Test: atest FrameworksNetTests
Test: Manully check that receiving intent and unregistering
      receiver can work normally.
Change-Id: Ie22a3aa40bc9243082672a64dba7c7940f9ff21a
2021-01-21 01:19:09 +08:00
Junyu Lai
12703ee175 Merge "Revert "[VCN06] Support request background network"" am: 2fa034c812 am: b7b3064394 am: dd7029fd30
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553864

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I896c2008e29163527b03f031623e1c70d16e1da4
2021-01-19 12:39:27 +00:00
Junyu Lai
dd7029fd30 Merge "Revert "[VCN06] Support request background network"" am: 2fa034c812 am: b7b3064394
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553864

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I81c094b08398d55a0ada21af60c22dfe7ec9cd97
2021-01-19 11:59:36 +00:00
Junyu Lai
b7b3064394 Merge "Revert "[VCN06] Support request background network"" am: 2fa034c812
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553864

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic8f292997e582da1eeeb469c91a52225ba4a2217
2021-01-19 11:34:18 +00:00
Junyu Lai
2fa034c812 Merge "Revert "[VCN06] Support request background network"" 2021-01-19 10:24:47 +00:00
Junyu Lai
34263da2c9 Revert "[VCN06] Support request background network"
Revert submission 1545847-vcn06

Reason for revert: b/177876289 presubmit failure
Reverted Changes:
I8042ce197:[VCN06.1] Add CTS for request background network
If9aaa87b7:[VCN06] Support request background network

Change-Id: I9270b02a2d6d1ffcdd83b4f41becaf09a2b91e0a
2021-01-19 09:06:00 +00:00
Treehugger Robot
6eba3e4554 Merge "Fix CaptivePortalDataTest#testParcelUnparcel on R" am: d806079674 am: 92884ae4ce am: 43522bd797
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553816

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e3e891f2104c3363b7e6eb46c12486a76f93d50
2021-01-19 05:46:41 +00:00
Treehugger Robot
b19d0ca85d Merge changes I475502fd,Ibf376a6f,Ia52f9caf am: 4fcb0e54a1 am: ed9f5d54a5 am: 0cc2e20cc9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553958

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic7c2c6289bcc469f43f0293ca4bfd7d6b15ce80a
2021-01-19 05:46:03 +00:00
Treehugger Robot
43522bd797 Merge "Fix CaptivePortalDataTest#testParcelUnparcel on R" am: d806079674 am: 92884ae4ce
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553816

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib62b14620dd2aa880bca086d7144b05e088d236d
2021-01-19 05:23:31 +00:00
Treehugger Robot
0cc2e20cc9 Merge changes I475502fd,Ibf376a6f,Ia52f9caf am: 4fcb0e54a1 am: ed9f5d54a5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553958

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I003a453f17b37f10e2acd4c92aa56fe52c09741f
2021-01-19 05:22:18 +00:00
Treehugger Robot
92884ae4ce Merge "Fix CaptivePortalDataTest#testParcelUnparcel on R" am: d806079674
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553816

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I74a6492618ca1e21e35474c012dee9886239e75a
2021-01-19 04:49:10 +00:00
Treehugger Robot
d806079674 Merge "Fix CaptivePortalDataTest#testParcelUnparcel on R" 2021-01-19 04:45:08 +00:00