Commit Graph

701 Commits

Author SHA1 Message Date
Lorenzo Colitti
a27075fe12 Merge "Add session ID to VpnTransportInfo" into sc-dev 2021-03-30 00:39:38 +00:00
lifr
8e9c33ab26 [automerger skipped] [TL02]Remove hidden API usage of NetworkAgent am: d90927f218 am: f788a656ce am: 6c3194320b -s ours
am skip reason: skip tag Change-Id I4e4040ae7f94bdf479c7df9ec2ffabafbe06331c with SHA-1 c4fd62072b is already in history

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

Change-Id: I627119002e2d4230939d2017728959934f14a528
2021-03-29 12:58:09 +00:00
lifr
6c3194320b [TL02]Remove hidden API usage of NetworkAgent am: d90927f218 am: f788a656ce
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642722

Change-Id: Id2679c6437a31718fb7612b07712bf8cef7fa293
2021-03-29 12:13:51 +00:00
lifr
f788a656ce [TL02]Remove hidden API usage of NetworkAgent am: d90927f218
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642722

Change-Id: I12342dc4c4ee8748396b7ced2f344611704caa2d
2021-03-29 11:39:55 +00:00
lifr
d90927f218 [TL02]Remove hidden API usage of NetworkAgent
The connection service will become the mainline module.
Remove the hidden API usage of NetworkAgent.

Bug: 170598012
CTS-Coverage-Bug: 170598012
Test: atest FrameworksNetTests FrameworksTelephonyTests
      atest FrameworksWifiTests
Change-Id: I4e4040ae7f94bdf479c7df9ec2ffabafbe06331c
Merged-In: I4e4040ae7f94bdf479c7df9ec2ffabafbe06331c
2021-03-29 15:33:44 +08:00
Remi NGUYEN VAN
db757adb55 [automerger skipped] Merge "Re-implement NetworkUtils#queryUserAccess." am: 43dc028b9f am: c567eb89a2 am: 376a846517 -s ours
am skip reason: skip tag Change-Id If855de1ea3e1fd2ed30f2795d9b4acfcf969a2dc with SHA-1 e8585ddf8b is already in history

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

Change-Id: I29ce6476762b1b4de205481ee8a5cab251220880
2021-03-29 06:59:52 +00:00
Remi NGUYEN VAN
376a846517 Merge "Re-implement NetworkUtils#queryUserAccess." am: 43dc028b9f am: c567eb89a2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650330

Change-Id: I8c016c0056fd29e60d89d5a90e75a7305ad73231
2021-03-29 06:14:57 +00:00
Remi NGUYEN VAN
c567eb89a2 Merge "Re-implement NetworkUtils#queryUserAccess." am: 43dc028b9f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650330

Change-Id: I1dd7913bacf5b92e35ec0a5b14da4d9b40513f21
2021-03-29 05:32:39 +00:00
Remi NGUYEN VAN
43dc028b9f Merge "Re-implement NetworkUtils#queryUserAccess." 2021-03-29 04:57:40 +00:00
Lorenzo Colitti
3f1a21ee00 Re-implement NetworkUtils#queryUserAccess.
Currently, queryUserAccess talks to netd via FwmarkServer.
Doing this from the module would require exposing queryUserAccess
as an NDK API or reimplementing FwmarkClient.

Because queryUserAccess really only uses information that comes
from ConnectivityService/PermissionMonitor anyway, just use that
information without calling to net.

Test: atest HostsideVpnTests
Bug: 171540887
Merged-In: If855de1ea3e1fd2ed30f2795d9b4acfcf969a2dc

Change-Id: If855de1ea3e1fd2ed30f2795d9b4acfcf969a2dc
2021-03-29 12:11:19 +09:00
lifr
4d604c81db Add session ID to VpnTransportInfo
- This will be visible only to apps with the NETWORK_SETTINGS
  permissions (signature), and will be redacted for all other callers.
- This string is expected to be the same as set by
  VpnService#setSession, and in general, VpnConfig.session. But it
  will be a general API that Vpn.java can call when setting the
  VpnTransportInfo.
- This string cannot be updated once the VPN NetworkAgent is connected.

Bug: 171872481
Test: atest ConnectivityServiceTest
      atest VpnTransportInfoTest
      atest android.net.cts.NetworkAgentTest
Change-Id: I8d09e25b83f7ee8be21ec9c9bd3c72a251f1370d
2021-03-29 10:12:17 +08:00
TreeHugger Robot
c4679685c1 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-26 18:02:54 +00:00
Treehugger Robot
3cbeeb97d6 [automerger skipped] Merge "Add network disconnected callback" am: c1657fb7f8 am: edca52ab74 am: 7b978c5cd7 -s ours
am skip reason: skip tag Change-Id I602ff2c688909473b03b72c9407d4286608cff4c with SHA-1 9affe28062 is already in history

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

Change-Id: I7a5a9589eaa8ef0022d5f9ee5f857bbe70fa38ad
2021-03-26 07:54:23 +00:00
Treehugger Robot
7b978c5cd7 Merge "Add network disconnected callback" am: c1657fb7f8 am: edca52ab74
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652259

Change-Id: Iec2661c2f77a17784f7be963d1a4d8ec8ef483ec
2021-03-26 07:05:30 +00:00
Treehugger Robot
edca52ab74 Merge "Add network disconnected callback" am: c1657fb7f8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652259

Change-Id: I75bd112821c42c16d7ed91ecbb4f21104c95204b
2021-03-26 06:28:19 +00:00
Treehugger Robot
c1657fb7f8 Merge "Add network disconnected callback" 2021-03-26 05:47:33 +00:00
Lorenzo Colitti
92aa222f02 Merge changes from topic "blocked-reasons-callback-tests" am: 2108a92452 am: 05c65a10f5 am: 5aa6b8d707
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652214

Change-Id: I4d69b1ce096d83c311620950650460024ae348c0
2021-03-26 05:27:47 +00:00
paulhu
1759727578 [automerger skipped] Add MOBILE_DATA_PREFERRED_APPS setting am: 7a4eeed62f am: ef7295f1ba am: 44d53d4f7e -s ours
am skip reason: skip tag Change-Id Ic5e0515b2b948de3d333c8d8e073d0b15514562a with SHA-1 63cf0d0e82 is already in history

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

Change-Id: I2c0061b6ee92303bb68f2752d038e578abcb1b85
2021-03-26 05:27:25 +00:00
paulhu
7475da2d83 [automerger skipped] Add PRIVATE_DNS_MODE setting setter am: 6865eb6dda am: 2165a27598 am: 9dc430f2bf -s ours
am skip reason: skip tag Change-Id If234426f041606c4881de1eca31b6f5bdb3c6bfe with SHA-1 d559441862 is already in history

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

Change-Id: I75eaedbfd00428cad87e5398c1f3bd54f0dbcd43
2021-03-26 05:27:07 +00:00
paulhu
00aa69df15 [automerger skipped] Expose ConnectivitySettingsManager as module-lib API am: 9443095517 am: ea9bb66a15 am: 187032ee37 -s ours
am skip reason: skip tag Change-Id I82225a43f95e3e1d3e52c4e7a0fc541c0087292e with SHA-1 b05c16b2a4 is already in history

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

Change-Id: Ibbe2daf0a26138fce2db0a00eebd32f1dd7c0df5
2021-03-26 05:26:39 +00:00
Chalard Jean
1a0debaab0 Merge changes from topic "ns05" into sc-dev
* changes:
  [NS06] Implement the don't-reap mechanism
  [NS05] Feed network offer callbacks
2021-03-26 05:07:39 +00:00
Lorenzo Colitti
5aa6b8d707 Merge changes from topic "blocked-reasons-callback-tests" am: 2108a92452 am: 05c65a10f5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652214

Change-Id: Ie51249f5fa47b0a5afe287083139082488f9b503
2021-03-26 04:36:19 +00:00
paulhu
44d53d4f7e Add MOBILE_DATA_PREFERRED_APPS setting am: 7a4eeed62f am: ef7295f1ba
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654015

Change-Id: I25b39c8f35dd80d13775c4a9c5074b2cd8c9f297
2021-03-26 04:36:10 +00:00
paulhu
9dc430f2bf Add PRIVATE_DNS_MODE setting setter am: 6865eb6dda am: 2165a27598
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654014

Change-Id: Iddc394112f17b3e4264a42c6326148833efe9297
2021-03-26 04:36:06 +00:00
paulhu
187032ee37 Expose ConnectivitySettingsManager as module-lib API am: 9443095517 am: ea9bb66a15
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654013

Change-Id: I0d623f62c2e5d4c975f74b1efed24bdf5cc7c669
2021-03-26 04:36:02 +00:00
Bill Yi
9b72c2e723 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Icb6afda3dd121777b2868361d2349917d2008d4d
2021-03-26 04:18:32 +00:00
Lorenzo Colitti
05c65a10f5 Merge changes from topic "blocked-reasons-callback-tests" am: 2108a92452
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652214

Change-Id: I02f2f4458329e17ab33d792dee98ffe5f6499ad0
2021-03-26 04:04:27 +00:00
paulhu
ef7295f1ba Add MOBILE_DATA_PREFERRED_APPS setting am: 7a4eeed62f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654015

Change-Id: I4d5c5cfaa2a35a6919517c6e5737fffdd0f217f3
2021-03-26 04:02:02 +00:00
paulhu
2165a27598 Add PRIVATE_DNS_MODE setting setter am: 6865eb6dda
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654014

Change-Id: I97de83147a0c656802601ec116ee9ee7de114884
2021-03-26 03:58:53 +00:00
paulhu
ea9bb66a15 Expose ConnectivitySettingsManager as module-lib API am: 9443095517
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654013

Change-Id: I6b53ced3ed523f984dde3c5b24cd53f832284da0
2021-03-26 03:54:38 +00:00
Chiachang Wang
1c5f57f921 Add network disconnected callback
Create a network callback to notify network agent after the
native network being destroyed by netd which means the network
is fully disconnected. The NetworkAgent may handle this event
after sending disconnect state to ConnectivityService to proceed
its pending works that have to be done after it.

Bug: 178725261
Test: make update-api
Change-Id: I602ff2c688909473b03b72c9407d4286608cff4c
Merged-In: I602ff2c688909473b03b72c9407d4286608cff4c
2021-03-26 02:53:29 +00:00
Chiachang Wang
ebbc803638 Merge "Expose BIP and VSIM relavent definitions" into sc-dev 2021-03-26 02:38:34 +00:00
Lorenzo Colitti
8ad5812ebc Add onBlockedStatusChanged(Network, int) to NetworkCallback.
This is similar to onBlockedStatusChanged(Network, boolean) but
it allows the callback holder to know the exact reason why
networking was blocked. It is useful to privileged system
components such as JobScheduler that are able to ignore some
blocked reasons but not others.

Also add a new BLOCKED_REASON_LOCKDOWN_VPN that is used when
networking is blocked because an always-on VPN is in
lockdown mode.

Also move BLOCKED_METERED_REASON_MASK to ConnectivityManager.
This is necessary because ConnectivityService must ensure that
the blocked status callbacks are correctly sent when meteredness
changes (e.g., a UID that is blocked on metered networks will
become unblocked on a network that becomes unmetered). In order
to do this it needs to know which reasons apply only on metered
networks.

Bug: 165835257
Test: unit tests in subsequent CLs in the stack
Change-Id: I647db4f5a01280be220288e73ffa85c15bec9370
2021-03-26 02:37:19 +09:00
paulhu
7a4eeed62f Add MOBILE_DATA_PREFERRED_APPS setting
This setting is OEM upstream requirement for mobile data
preferred apps feature.

Bug: 171872461
Test: atest FrameworksNetTests
Merged-In: Ic5e0515b2b948de3d333c8d8e073d0b15514562a
Change-Id: Iba17bf68cffbe39d1c08ad94364b41bbf851bf57
2021-03-26 02:37:19 +09:00
paulhu
6865eb6dda Add PRIVATE_DNS_MODE setting setter
Bug: 182538166
Test: atest FrameworksNetTests
Merged-In: If234426f041606c4881de1eca31b6f5bdb3c6bfe
Change-Id: Iaa9e6cc92f1805ab341c308fc60e947ec4c674f0
2021-03-26 02:37:16 +09:00
paulhu
9443095517 Expose ConnectivitySettingsManager as module-lib API
Have getter/setter methods for external modules that can
get/set the setting values.

Bug: 182538166
Test: atest FrameworksNetTests
Merged-In: I82225a43f95e3e1d3e52c4e7a0fc541c0087292e
Change-Id: I61cb00216494e35b6e0dfe444b177cad36ad8afb
2021-03-26 02:35:07 +09:00
Chiachang Wang
02385fefae [automerger skipped] Merge "Add network created callback support" am: 1b7563cb1e am: d9763ad11b am: 4f7c63a58a -s ours
am skip reason: skip tag Change-Id I8c2ff7bd6980ae838abc5669f9419d62741b8666 with SHA-1 18d4281317 is already in history

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

Change-Id: Ie637f132849c0d4f20b65b4e6e3e4f7d1bdf141a
2021-03-25 15:11:52 +00:00
Paul Hu
1cda176f02 Merge "Add MOBILE_DATA_PREFERRED_APPS setting" into sc-dev 2021-03-25 15:01:30 +00:00
Remi NGUYEN VAN
e0a1a2a73a Merge "Use connectivity APIs from framework-connectivity" into sc-dev 2021-03-25 14:51:55 +00:00
Chiachang Wang
4f7c63a58a Merge "Add network created callback support" am: 1b7563cb1e am: d9763ad11b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652209

Change-Id: Ia98837b70d22f5c15db77c54d58e142967bdd814
2021-03-25 14:22:19 +00:00
Chalard Jean
fa33bef466 [NS06] Implement the don't-reap mechanism
This exposes a mechanism for network providers to tell
the network stack that a given network must be kept up
for some specific reason. This is meant to be easier
for them than to have to file a request, in particular
because there is no guaranteed way to make sure the
request will be best matched by any given network.

Test: new test for this
Bug: 167544279
Change-Id: I238a3ee5ee9262477a23b897e4141769dd1505d1
2021-03-25 14:10:06 +00:00
Paul Hu
fe704c3d7e Merge "Add PRIVATE_DNS_MODE setting setter" into sc-dev 2021-03-25 13:59:18 +00:00
Paul Hu
50c73a6865 Merge "Expose ConnectivitySettingsManager as module-lib API" into sc-dev 2021-03-25 13:50:45 +00:00
Chiachang Wang
d9763ad11b Merge "Add network created callback support" am: 1b7563cb1e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652209

Change-Id: Ibd2d575b5e3bdfc164c4721bc5bbb0c8b90601e0
2021-03-25 13:42:54 +00:00
Chiachang Wang
1b7563cb1e Merge "Add network created callback support" 2021-03-25 13:22:17 +00:00
Chiachang Wang
d3881b98ed Expose BIP and VSIM relavent definitions
In order to support special APNs below, OEM may need extra
NetworkCapabilities and apn type definition to support the
carriers request. Add corresponding definition into API
surface.

VSIM: for Virtual SIM service
BIP: for Bearer Independent Protocol

Bug: 130869457
Test: make update-api
Change-Id: I41e881c6fe39e92d5cdac2d0a02fa8a8e814c9c5
2021-03-25 21:19:37 +08:00
paulhu
63cf0d0e82 Add MOBILE_DATA_PREFERRED_APPS setting
This setting is OEM upstream requirement for mobile data
preferred apps feature.

Bug: 171872461
Test: atest FrameworksNetTests
Change-Id: Ic5e0515b2b948de3d333c8d8e073d0b15514562a
2021-03-25 13:13:15 +00:00
Chalard Jean
428b913abd [NS05] Feed network offer callbacks
The design is very simply expressed :
An offer is needed for a request if and only if that offer
might beat the satisfier for that request.

The implementation of "might beat" is NetworkRanker#mightBeat.

Test: FrameworksNetTests FrameworksWifiTests NetworkStackTests
Bug: 167544279
Change-Id: I0fe911eef2483ecbac48c733d56283b81538690a
2021-03-25 22:13:10 +09:00
paulhu
d559441862 Add PRIVATE_DNS_MODE setting setter
Bug: 182538166
Test: atest FrameworksNetTests
Change-Id: If234426f041606c4881de1eca31b6f5bdb3c6bfe
2021-03-25 13:11:54 +00:00
Lucas Lin
067841c859 [automerger skipped] Merge "Expose some APIs from ConnectivityManager" am: 8e4ae68ddd am: a2ec6c3696 am: 8242b68d7d -s ours
am skip reason: skip tag Change-Id I1fb5ecfbe37878ba3534e6c6c7599ca29db2735c with SHA-1 97fb10a3a6 is already in history

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

Change-Id: Id36817eef371fd456bbb4f95cd713e43b833bae9
2021-03-25 13:10:18 +00:00