Commit Graph

530701 Commits

Author SHA1 Message Date
Benedict Wong
e0eb89cf66 Merge "Add shell VcnManagementService" am: fa2c588ab5 am: 1ee8f22e8a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456942

Change-Id: I41d115e53d3b83c89695d860bca69d4f752a1e44
2020-10-29 22:37:57 +00:00
Benedict Wong
1ee8f22e8a Merge "Add shell VcnManagementService" am: fa2c588ab5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456942

Change-Id: If99f4c5a82fbab5ba136ba9354932020de9383de
2020-10-29 21:55:37 +00:00
Benedict Wong
fa2c588ab5 Merge "Add shell VcnManagementService" 2020-10-29 21:32:14 +00:00
Treehugger Robot
d08754f4ac Merge "Add trackingBug to SharedMemory.getFd()" am: 7b9e2bd143 am: 3e65b3750b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479878

Change-Id: I43e991a35c14cf7149ed20408c08573e00f14b4c
2020-10-29 19:08:48 +00:00
Treehugger Robot
3e65b3750b Merge "Add trackingBug to SharedMemory.getFd()" am: 7b9e2bd143
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479878

Change-Id: I646f1d1f13b866b7bb7766f01cdc978746ee5b2f
2020-10-29 18:33:32 +00:00
Treehugger Robot
7b9e2bd143 Merge "Add trackingBug to SharedMemory.getFd()" 2020-10-29 17:55:17 +00:00
Treehugger Robot
3c8ef9d1d4 Merge "Add trackingBug to Process.myPpid." am: 081f27d84e am: bd6e1033fb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478641

Change-Id: If394833b11720aeaf9a5c75ca95efb60ff390249
2020-10-29 16:44:03 +00:00
Treehugger Robot
bd6e1033fb Merge "Add trackingBug to Process.myPpid." am: 081f27d84e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478641

Change-Id: I17a98a71f294bad93a5685fc82ec3a71ab8eba6e
2020-10-29 16:11:48 +00:00
Mathew Inwood
0f9429be41 Add trackingBug to SharedMemory.getFd()
Bug: 171971817
Change-Id: Ib8367f9b310903d63eb000e4cce238693c1544b2
2020-10-29 15:52:51 +00:00
Treehugger Robot
081f27d84e Merge "Add trackingBug to Process.myPpid." 2020-10-29 15:41:54 +00:00
Mathew Inwood
4c2bef7b71 Add trackingBug to Process.myPpid.
Bug: 171962076
Change-Id: Id2e731f471199a368b5a22046e0899d7b37f7337
2020-10-29 13:43:18 +00:00
Chalard Jean
59e88e779e Merge "Fix a bug where modern network agents start in UNKNOWN" am: fc2b39948c am: 63b234d158
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460964

Change-Id: I1acdfe14a14bfca15967efe2d97b653691e259f8
2020-10-29 13:30:39 +00:00
Chalard Jean
63b234d158 Merge "Fix a bug where modern network agents start in UNKNOWN" am: fc2b39948c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460964

Change-Id: I69c5b8712791491552879c6d5aba5352ea03adfc
2020-10-29 13:10:05 +00:00
Chalard Jean
fc2b39948c Merge "Fix a bug where modern network agents start in UNKNOWN" 2020-10-29 12:31:03 +00:00
Chalard Jean
6e61ad716c Fix a bug where modern network agents start in UNKNOWN
Modern network agents are supposed to have the following
lifecycle :
• Construct the agent
• Declare itself to connectivity by calling #register()
• Possibly do some setup
• Declare connected by calling #markConnected()
• Declare disconnected by calling #unregister()

Internally ConnectivityService still manages the state
with deprecated NetworkInfo, which has a lot of possible
detailed states, most of which are now unused. Internally,
the steps above translate to the states below :
• When the agent calls #register() it starts in state
  CONNECTING
• When it calls #markConnected() it goes to CONNECTED
• When it calls #unregister() it goes to DISCONNECTED which
  triggers the flow that disconnects it immediately
• ConnectivityService also synthesizes the SUSPENDED state
  under some situations, but that's not relevant here.

The translation above is done by the NetworkAgent class,
which translates #register(), #markConnected() and
The only valid lifecyle for new agents is thus :

CONNECTING → CONNECTED → disconnect
                 ↕         ↑
             SUSPENDED ───┘

Note that in the above scheme, there is no space for the
UNKNOWN state, which is only used by legacy network agents.
However, the constructor for NetworkInfo still starts with
UNKNOWN. Ideally the constructor for NetworkInfo would set
the info to CONNECTING instead, but this would be a very
visible change in behavior affecting many apps (especially
their tests), so for backward compatibility we can't do
that.

New network agents however don't expose their NetworkInfo
to the client code, so they can just be made to start in
CONNECTING the way it was meant.

Note that this didn't really have a concrete impact beyond
printing some logs as by and large the ConnectivityService
code handles UNKNOWN and CONNECTING the same way, or more
exactly it handles transitions to CONNECTED from UNKNOWN
and CONNECTING in the same way. The exception to this is
VPNs, which are not using the new agent API yet, and the
upcoming conversion is why this fix is actually needed now.

Bug: 170904131
Test: FrameworksNetTests NetworkStackTests
Test: new test in aosp/1460705
Change-Id: Ib7d906a7b29a0b9f000b90bc78558a7402852fa3
2020-10-29 12:30:44 +00:00
Chalard Jean
441c5bc2e8 Merge changes I623e2983,I8b95e020 am: ec1966e372 am: bf84b9239b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479476

Change-Id: I8fa040d1156b88de203e6e6f1ddb776faf0ba82c
2020-10-29 10:32:30 +00:00
Chalard Jean
bf84b9239b Merge changes I623e2983,I8b95e020 am: ec1966e372
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479476

Change-Id: I39e260b987fcc371028107bc683f67f1b8833727
2020-10-29 09:54:15 +00:00
Chalard Jean
ec1966e372 Merge changes I623e2983,I8b95e020
* changes:
  Fix comments from aosp/1455975
  Manage VPN legacy state separately from NetworkInfo
2020-10-29 09:21:34 +00:00
Treehugger Robot
29bed11140 Merge changes from topic "bug_167962976_visibility" am: 39c6068cbc am: 5942721506
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478840

Change-Id: I39d4edd4511d1677af0415d57123f88e5705c3dc
2020-10-29 07:47:45 +00:00
Treehugger Robot
2308172769 Merge "Replace hidden NMS permission control API" am: d8288fe344 am: 38be0ff345
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473957

Change-Id: I45135311ec026b75d1110614f609b851b72f543b
2020-10-29 07:47:31 +00:00
Treehugger Robot
772467cf0e [automerger skipped] Merge "Remove unused telephony api files." am: bff73060c9 am: edc0fa3fe5 -s ours
am skip reason: Change-Id Ie91e11a23988729a63b6bf6a7ba965552b241748 with SHA-1 db305ea9d7 is in history

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

Change-Id: I7d1dd70360ddd4f1e85fae080367c50a99967bfa
2020-10-29 07:47:21 +00:00
Treehugger Robot
5942721506 Merge changes from topic "bug_167962976_visibility" am: 39c6068cbc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478840

Change-Id: Iba29a96f2058373cc5d0454551ec2bd64b6e7b1b
2020-10-29 07:38:04 +00:00
Treehugger Robot
38be0ff345 Merge "Replace hidden NMS permission control API" am: d8288fe344
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473957

Change-Id: I44840dc0c5ab4421976f606afcced0573e3dfe60
2020-10-29 07:34:41 +00:00
Treehugger Robot
edc0fa3fe5 Merge "Remove unused telephony api files." am: bff73060c9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1477537

Change-Id: Ie8e5af3cf3fe263194100342741e94c852efc0ff
2020-10-29 07:23:59 +00:00
Treehugger Robot
39c6068cbc Merge changes from topic "bug_167962976_visibility"
* changes:
  Add OWNERS block to prevent the tree from mooving during migration.
  Add visibility rules for packages/modules/Connectivity/Tethering
2020-10-29 07:15:03 +00:00
Treehugger Robot
d8288fe344 Merge "Replace hidden NMS permission control API" 2020-10-29 07:03:37 +00:00
Treehugger Robot
bff73060c9 Merge "Remove unused telephony api files." 2020-10-29 06:41:27 +00:00
Howard Chen
46a6aee06d Merge "Add a mutability flag to the PendingIntent in DynamicSystemInstallationService" am: dc0b992c75 am: 5107e43858
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479478

Change-Id: I78b38fdf4bd8ddad4eb6abf9ddf89c15e6537093
2020-10-29 06:35:55 +00:00
Xiao Ma
a88adc48fc Merge changes from topic "revert-1353490-revert-1323251-ipv6_prov_loss_quirk_parcelable-DVBHZDYMHA-MDHWFKJABZ" am: 8e8460b4b3 am: aa24ca0106
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460265

Change-Id: Ibfd085b283caf6a531cbdf752e009317eb105287
2020-10-29 06:35:46 +00:00
Xiao Ma
e26d6ebc1c Revert "Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttributes""" am: 42c643a2e5 am: 1145cdcefe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460264

Change-Id: Ie6b10f73ac6508b83e240e74a215edbe58901be3
2020-10-29 06:35:44 +00:00
Howard Chen
5107e43858 Merge "Add a mutability flag to the PendingIntent in DynamicSystemInstallationService" am: dc0b992c75
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479478

Change-Id: Ic30b4a9678e23f390b2138dd21ebf3dccb6a58aa
2020-10-29 06:21:05 +00:00
Xiao Ma
aa24ca0106 Merge changes from topic "revert-1353490-revert-1323251-ipv6_prov_loss_quirk_parcelable-DVBHZDYMHA-MDHWFKJABZ" am: 8e8460b4b3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460265

Change-Id: I49ce3e1c7794dc6db0e410cba481eb98144bc4e5
2020-10-29 06:17:22 +00:00
Xiao Ma
1145cdcefe Revert "Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttributes""" am: 42c643a2e5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460264

Change-Id: Ie13b2bb8037d85ab4782e06cfc31e108397fc78b
2020-10-29 06:09:44 +00:00
Howard Chen
dc0b992c75 Merge "Add a mutability flag to the PendingIntent in DynamicSystemInstallationService" 2020-10-29 06:05:57 +00:00
Chiachang Wang
84aa44d22b Merge changes I6a51d803,I162fae5c am: b524e17519 am: 18013cefe3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473228

Change-Id: I61cdda413fe21a46ac075a0abba2b9affa015149
2020-10-29 05:52:33 +00:00
Chiachang Wang
a6b1b5722a Merge "Replace hidden NMS interface to network API" am: 2a40529747 am: 667b09128d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473224

Change-Id: Ifc403211281b58bf25c9e7c652a863368b80deae
2020-10-29 05:52:12 +00:00
Xiao Ma
8e8460b4b3 Merge changes from topic "revert-1353490-revert-1323251-ipv6_prov_loss_quirk_parcelable-DVBHZDYMHA-MDHWFKJABZ"
* changes:
  Add jarjar rule for IPv6ProvisioningLossQuirk.
  Revert "Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttributes"""
2020-10-29 05:39:16 +00:00
Chiachang Wang
18013cefe3 Merge changes I6a51d803,I162fae5c am: b524e17519
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473228

Change-Id: I1ed98a5295891da0eef007960e4260dfd047de2b
2020-10-29 05:22:37 +00:00
Chiachang Wang
667b09128d Merge "Replace hidden NMS interface to network API" am: 2a40529747
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473224

Change-Id: Ia5c064f19e2736b77d85400f7f5da5b81c766a1e
2020-10-29 05:17:49 +00:00
Chiachang Wang
b524e17519 Merge changes I6a51d803,I162fae5c
* changes:
  Replace hidden NMS API for setting MTU
  Replace hidden NMS default network configuration API
2020-10-29 05:03:43 +00:00
Chiachang Wang
2a40529747 Merge "Replace hidden NMS interface to network API" 2020-10-29 05:02:21 +00:00
Baligh Uddin
ce31148616 Add OWNERS block to prevent the tree from mooving during migration.
BUG: 167962976
TEST: None.
Change-Id: I49db5a11ee89645dac158ec3757180b2387e2d70
2020-10-29 03:24:01 +00:00
Howard Chen
54653ba116 Add a mutability flag to the PendingIntent in DynamicSystemInstallationService
Bug: 171718124
Test: DSU installation
Change-Id: Id352e37238aad6499841dc379b006f2e0150181d
2020-10-29 11:06:26 +08:00
Chalard Jean
e7f602e398 Fix comments from aosp/1455975
Test: FrameworksNetTests NetworkStackTests
Change-Id: I623e29833c22b5c8ab84a74c7f5732423f00d07c
2020-10-29 11:56:03 +09:00
Chalard Jean
1f832406ca Manage VPN legacy state separately from NetworkInfo
This is mainly a cleanup, but is also necessary for the
network selection project.

This is for network selection ultimately because NetworkSelection
needs NetworkAgents to use the newer API introduced in R rather
than the legacy internal API. Using that API forbids communicating
to ConnectivityService through NetworkInfo, and does not support
the FAILED state because there is no usage in connectivity.
In VPN, FAILED is used only to communicate a state to Settings
and it does this through IConnectivityManager.getLegacyVpnInfo,
which already is using an int to communicate this information.

Splitting the legacy state from NetworkInfo not only is simpler
ultimately because it's the format in which it's consumed, but
also will allow removing NetworkInfo completely.

Test: FrameworksNetTests NetworkStackTests
Bug: 167544279
Change-Id: I8b95e020919e38a5166892221096db6271985574
2020-10-29 11:43:20 +09:00
Baligh Uddin
ff8ff126c7 Add visibility rules for packages/modules/Connectivity/Tethering
BUG: 167962976
Test: TH
Change-Id: Id28881b35cf24fc9517fa11af6d8e539ab244fa6
2020-10-29 02:11:55 +00:00
Treehugger Robot
d325e02efc Merge "CEC: Add range validator for one byte parameters" am: e7d24dad51 am: 0d776820b1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433919

Change-Id: Idfa0eda9272717b82d6f1fadda38d26e9f8b7cfe
2020-10-29 01:53:28 +00:00
Hall Liu
44435a2175 Merge "Update docs for TelephonyManager#getServiceState" am: 66917569e1 am: a29952e222
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1474964

Change-Id: I18936e40ac9bb19ac91b50f4294aabb3b683320a
2020-10-29 01:49:27 +00:00
Treehugger Robot
396079ce63 Merge "CEC: Add unit test for Record Status Validator" am: 5fee207876 am: 96750a088c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460268

Change-Id: I34a76caeb245e9a47ecd187c6a00084b49acd532
2020-10-29 01:49:14 +00:00
Yuchao Zhou
35e7e24870 Merge "Remove outdated bluetooth tests" am: 2dc2ac6ac7 am: 33f9ffcc66
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1477677

Change-Id: I1433a0cb67de4e39696f911dac253ee5510e7908
2020-10-29 01:48:28 +00:00