Commit Graph

5850 Commits

Author SHA1 Message Date
Sarah Chin
af54fe6b6d Merge "Update setSubscriptionOverride API to allow network types" 2021-01-21 18:28:18 +00:00
Chiachang Wang
21985b42ac Merge "Use ParcelFileDescriptor instead of FileDescriptor in the aidl" am: 39efdb2451 am: 2de3786907 am: c5698a5bc9
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
Paul Hu
df28bddbfd Merge "Replace Context @hide API in MultinetworkPolicyTracker" am: e8bf3e902b am: 465b565d49 am: 892fa611ea
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
Chiachang Wang
92b94e1ec5 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
e8bf3e902b Merge "Replace Context @hide API in MultinetworkPolicyTracker" 2021-01-21 07:53:19 +00:00
Remi NGUYEN VAN
14d5c2eaa7 Merge "Mark TestNetworkManager as module API" am: 24ea1e0377 am: ae781e1b30 am: 0397559e6f
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
24ea1e0377 Merge "Mark TestNetworkManager as module API" 2021-01-21 06:02:25 +00:00
Remi NGUYEN VAN
8700d3345b 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
Frank Li
3c1db05464 Merge "Deprecated IP connectivity metrics system api" am: 6822a558b2 am: db8bc33ea7 am: bd2eb8b1e5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549818

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic983d10b0f3534f90ed38a6155258e63ab29f2cc
2021-01-20 18:54:34 +00:00
paulhu
24e3388080 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
lifr
6e6149c471 Deprecated IP connectivity metrics system api
- In order to easily maintain the connectivity service.
Refactor the connectivity service by removing all legacy
metrics code & API.
- The commit will deprecate legacy metrics system api.
(The legacy metrics code will be removed in a separate commit.)
Therefore, those legacy metrics event may not be sent in
Android S and above.

Bug: 177043087
Test: atest ConnectivityServiceTest
      atest IpConnectivityMetricsTest
      atest ConnectivityServiceIntegrationTest
Change-Id: Ia057776869a7d38041b6eaf17904f6c54a7b4fca
2021-01-20 02:06:18 +00:00
Cody Kesting
b170620197 Merge changes I61dd789f,I57c73264 am: 48a1062811 am: fb9eb14070 am: 00328b1c78
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532160

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie5651cedab08223b0a32c5a2aaefd98a193077d0
2021-01-19 21:22:40 +00:00
Cody Kesting
48a1062811 Merge changes I61dd789f,I57c73264
* changes:
  Define add and remove for VCN policy listeners.
  Define VcnUnderlyingNetworkPolicy.
2021-01-19 19:37:53 +00:00
Junyu Lai
d4a9671068 Merge "Revert "[VCN06] Support request background network"" am: b380466d29 am: 932ab25ed6 am: 707465a26a
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
b380466d29 Merge "Revert "[VCN06] Support request background network"" 2021-01-19 10:24:47 +00:00
Junyu Lai
854241172b 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
9872fdbebe Merge "Remove usage of NetCapability" am: bd3110f654 am: dd7445523b am: 7008bece02
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552499

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b8505f9bcba4e93acf92a0a5f31485555666949
2021-01-19 07:08:48 +00:00
Treehugger Robot
bd3110f654 Merge "Remove usage of NetCapability" 2021-01-19 05:16:00 +00:00
Junyu Lai
ecc7fdfed1 Merge "[VCN06] Support request background network" am: a18490bdde am: 1856a60c7b am: 645596b998
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545847

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12d2cbe4a5fc10a7ec7abf8038c088fe13b02d59
2021-01-19 01:50:31 +00:00
Junyu Lai
a18490bdde Merge "[VCN06] Support request background network" 2021-01-19 01:04:20 +00:00
junyulai
d4d56da595 [VCN06] Support request background network
This will be mainly used by VCN management service which will
need to hold the networks but preserve the backgrounded-ness
of the networks.

Test: android.net.ConnectivityManagerTest#testRequestType
Test: android.net.cts.ConnectivityManagerTest#testRequestBackgroundNetwork /
      --rerun-until-failure 100
Test: ConnectivityServiceTest#testBackgroundNetworks
Test: m -j doc-comment-check-docs
Bug: 175662146
Change-Id: If9aaa87b7e71c2b695ac7b08858850e975b28bb6
2021-01-18 16:32:08 +08:00
Treehugger Robot
44adf05cb3 Merge "Remove usage of hidden .netId in IpConnectivityLog" am: 36b467616c am: 9f8f5a4041 am: 4c0b20a147
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552498

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia32bb7804655629da639b0b0f705b7e590e9f82c
2021-01-18 07:21:15 +00:00
Treehugger Robot
36b467616c Merge "Remove usage of hidden .netId in IpConnectivityLog" 2021-01-18 06:36:02 +00:00
Chiachang Wang
c66881642d Merge "Replace hidden ParcelFileDescriptor constructor usage" am: 1cad04fa9b am: baa006c4a5 am: 4d20e6990b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552154

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38369186c581fcde3e21c91af6b35ccd88320509
2021-01-18 03:27:17 +00:00
Chiachang Wang
1cad04fa9b Merge "Replace hidden ParcelFileDescriptor constructor usage" 2021-01-18 01:59:10 +00:00
Chiachang Wang
8636d9f5e5 Replace hidden ParcelFileDescriptor constructor usage
If IOException happens while trying to start keepalives sockets,
an invalid fd will be constructed. It will fail with
ERROR_INVALID_SOCKET if the user later calls start(). Current
design to construct the invalid fd use the hidden
ParcelFileDescriptor constructor which will not work for the
incoming ConnectivityService mainline. Thus, replace it with
the other formal API.

Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: I57fd7ec2281c5e8c75481200bbde723ecf96982a
2021-01-18 01:58:49 +00:00
Sudheer Shanka
11c3125efb Merge "Reduce NPMS threshold for network restrictions to IMP_FG." 2021-01-16 00:07:35 +00:00
Cody Kesting
21d7726c67 Merge "Define VcnTransportInfo." am: 698188edad am: d0e60b02c2 am: 946bc463ec
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548434

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3210ce38331dc17e16b745f73c6289ac3f233022
2021-01-15 17:22:11 +00:00
Cody Kesting
80cde857e1 Define add and remove for VCN policy listeners.
Bug: 175729529
Test: atest FrameworksVcnTests
Change-Id: I61dd789fe4a4ebd1ca95866494d0e42e97c202cc
2021-01-15 09:21:59 -08:00
Cody Kesting
90f27fc842 Define VcnUnderlyingNetworkPolicy.
Bug: 175729529
Test: atest FrameworksVcnTests
Change-Id: I57c732640d6d21db1f4d68c69ff320918e7891c3
2021-01-15 07:55:18 -08:00
Remi NGUYEN VAN
d58bdcf4e5 Remove usage of NetCapability
The NetCapability annotation is internal to NetworkCapabilities. IntDef
annotations cannot be part of the API as per API guidelines, so the
NetCapability annotation cannot be used from outside of the connectivity
module, once it is built.

Bug: 174436414
Test: m
Change-Id: I1d6d87432d1e3af8a20169b18ceffa0c1130a836
2021-01-15 23:59:53 +09:00
Remi NGUYEN VAN
26a1726b88 Remove usage of hidden .netId in IpConnectivityLog
Use the Network#getNetId API instead.

IpConnectivityLog is planned to be outside of the connectivity module,
so it cannot use hidden symbols implemented in the module.

Bug: 174436414
Test: m
Change-Id: I947a32612c59b53f22fe1c38706de8919ca5043a
2021-01-15 23:59:20 +09:00
Sudheer Shanka
200967d138 Reduce NPMS threshold for network restrictions to IMP_FG.
Reducing the threshold from BFGS to IMP_FG to make sure
Expedited jobs are not subject to network restrictions
during power and data saver modes.

Bug: 177641226
Test: atest CtsHostsideNetworkTests:HostsideRestrictBackgroundNetworkTests
Change-Id: I936e4c27710a54f61346234b7999f996acca86a1
2021-01-15 02:47:55 -08:00
Cody Kesting
2ef4ac2c95 Define VcnTransportInfo.
This CL defines VcnTransportInfo - a TransportInfo to be used for
top-level VCN Networks registered with ConnectivityService.

Bug: 177261675
Test: atest FrameworksVcnTests
Change-Id: I66e9a0bf73c6e42eb5aa7fd39463fdfed483ecfa
2021-01-14 17:55:00 -08:00
Sarah Chin
b321fb5fc8 Update setSubscriptionOverride API to allow network types
Allow 5G unmetered override via a different API than
setSubscriptionPlans. OVERRIDE_UNMETERED can be set without defining
SubscriptionPlans, but OVERRIDE_CONGESTED behavior remains the same.
Both the unmetered and congested case of setSubscriptionOverride take in
networkTypes as an additional parameter

Test: atest FrameworksTelephonyTests
Test: atest SubscriptionManagerTest
Bug: 175723642
Change-Id: Ie196db5e236e478f1c29c3dfd1ca31acc205c54b
2021-01-14 13:54:12 -08:00
Roshan Pius
d3ee5559ed Merge "NetworkCapabilities: Embed location senstive TransportInfo" 2021-01-14 15:38:15 +00:00
Aaron Huang
c91a0f9491 Merge "Migrate Slog usage in MultinetworkPolicyTracker to Log" am: 570985a03e am: 5fe62a1765 am: ee60d070c4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549720

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad48fae63c7ef8c72e565cee8426fcbdd20c6295
2021-01-14 10:20:03 +00:00
Aaron Huang
570985a03e Merge "Migrate Slog usage in MultinetworkPolicyTracker to Log" 2021-01-14 09:10:17 +00:00
Junyu Lai
8af09844db Merge "[VCN05] Pass request type when requesting network" am: 539dbe61c5 am: e7e0e5b7ba am: 1f1e9e481d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545846

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4280a78822db2943f0a62a3d729aac3b5f64326d
2021-01-14 09:05:35 +00:00
Junyu Lai
539dbe61c5 Merge "[VCN05] Pass request type when requesting network" 2021-01-14 06:52:46 +00:00
Aaron Huang
b49351989d Merge "Rename PacManager to PacProxyInstaller" am: 3b26172c84 am: 3fb8d62ea1 am: ce85d34306
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513130

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I10ff3bab210dbfeb10a19ea99459038499ce5ed9
2021-01-14 04:44:01 +00:00
Aaron Huang
1248c0376b Migrate Slog usage in MultinetworkPolicyTracker to Log
Connectivity mainline module cannot use hidden API so
replace Slog with Log which is a public API.

Test: FrameworksNetTests
Change-Id: I8758079cf635ff4ab218df53c0f7bf6fc23ce476
2021-01-14 09:53:38 +08:00
Aaron Huang
3b26172c84 Merge "Rename PacManager to PacProxyInstaller" 2021-01-14 01:52:24 +00:00
Roshan Pius
73bfb1d48e Merge changes from topic "revert-13329427-revert-13274595-XTPTORCRLV-WLDUPFEJWD"
* changes:
  NetworkControllerWifiTest: Fix unit tests
  Revert "Revert "NetworkCapabilities: Embed location senstive Tra..."
2021-01-14 01:19:34 +00:00
Roshan Pius
0143b056bf Revert "Revert "NetworkCapabilities: Embed location senstive Tra..."
Revert^2 "WifiLocationTest: Add test for Wifi TransportInfo"

b548aac6081a6899e966d7a8d961f2a47147e244

Exempt-From-Owner-Approval: Reland of approved CL

Bug: 162602799
Bug: 177390648
Test: atest com.android.systemui.statusbar.policy.NetworkControllerWifiTest
Change-Id: Iec8d1441e8d02ff43037fdcb0c90065adff8e716
2021-01-13 22:28:01 +00:00
satayev
f10f76a169 Merge "Revert "[VCN01] Add NOT_VCN_MANAGED capability"" am: 805f4d7c22 am: f323a0f2f0 am: 226d233fb0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549962

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I051a51e5ee5898784d3a126140536ddeec6a0ba6
2021-01-13 18:53:37 +00:00
satayev
805f4d7c22 Merge "Revert "[VCN01] Add NOT_VCN_MANAGED capability"" 2021-01-13 17:40:03 +00:00
satayev
0e9334cb80 Revert "[VCN01] Add NOT_VCN_MANAGED capability"
This reverts commit 85e0ad7986.

Reason for revert: b/177411288 broken test

Bug: 177411288
Bug: 175662146
Change-Id: I02a25b83e62ab9a2ed22a98530d62b08de73f56e
2021-01-13 15:04:23 +00:00
Rick Yiu
5a5eab67e5 Merge "Revert "NetworkCapabilities: Embed location senstive TransportInfo"" 2021-01-13 14:30:52 +00:00
Junyu Lai
da2a149f62 Merge "Align coding style of line-wrapping in NetworkCapabilities" am: 357893095f am: 075f097e82 am: a5dfc094fe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529105

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I15dc61c1c845de22cd973156e00549395800edeb
2021-01-13 12:09:32 +00:00