Commit Graph

921 Commits

Author SHA1 Message Date
Chalard Jean
dfd53217e3 Merge changes Id7ee1bd3,I5ea44a94 into sc-dev
* changes:
  [NS08] Expose public NetworkScore API
  [NS07] Add the rest of the scoring policy
2021-03-31 11:42:19 +00:00
Chiachang Wang
e9d848e7cb Add visibility of framework-connectivity.impl for wifi test
Add visibility to allow FrameworksWifiTests to access hidden
connectivity APIs.

Bug: 171540887
Test: m FrameworksWifiTests
Change-Id: I3cd377d7045e7e161d0813aa2d614dff1b5a311b
2021-03-31 09:33:21 +00:00
Remi NGUYEN VAN
173f8b129d Add framework-connectivity-test-defaults
The defaults follow the same pattern as framework-wifi-test-defaults to
allow unit tests to build against hidden API in Connectivity.

Bug: 171540887
Test: m
Change-Id: I58bb6574f7e95053e4a95f76d1025506749ec2b8
2021-03-31 17:19:57 +08:00
Chalard Jean
a94f778231 [NS08] Expose public NetworkScore API
This exposes the two bits settable by the network agents in
Android S on NetworkScore. This is meant to be extensible in
future releases, or possibly for OEM upstreams.

Test: builds
CTS-Coverage-Bug: 184037351
Bug: 167544279
Change-Id: Id7ee1bd3e2679f0bd5200d5c299f18a33b87847c
2021-03-30 23:54:19 +09:00
Chalard Jean
5236df9ddf [NS07] Add the rest of the scoring policy
Bug: 167544279
Test: FrameworksNetTests
Change-Id: I5ea44a94ac6f16486274e9091f15a84734db2341
2021-03-30 23:50:41 +09:00
Lorenzo Colitti
6bed8201a3 Merge "Add new network capabilities to support automotive head unit via USB" into sc-dev 2021-03-30 14:36:56 +00:00
Frank Li
701d2587c4 [automerger skipped] Merge "[JS01]Remove hidden API usage of Connectivity Sevice" am: 487698b2b7 am: 647d2b66cc am: 5b2e07974a -s ours
am skip reason: skip tag Change-Id Ie6bc81ff382fb242b98f35d28a96defc207c7987 with SHA-1 308bcccd2b is already in history

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

Change-Id: I8704e12681669b9a67a53cf2b80eb361f599229f
2021-03-30 09:44:24 +00:00
Frank Li
5b2e07974a Merge "[JS01]Remove hidden API usage of Connectivity Sevice" am: 487698b2b7 am: 647d2b66cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628361

Change-Id: I7b4e289f13856f8015757d23a478fa923773d37a
2021-03-30 09:00:11 +00:00
Frank Li
647d2b66cc Merge "[JS01]Remove hidden API usage of Connectivity Sevice" am: 487698b2b7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628361

Change-Id: Ibc9e5b382c210e157f9af9c1071b2e2e1065320e
2021-03-30 08:03:56 +00:00
Frank Li
487698b2b7 Merge "[JS01]Remove hidden API usage of Connectivity Sevice" 2021-03-30 07:22:40 +00:00
lifr
b4dab37e28 [JS01]Remove hidden API usage of Connectivity Sevice
The Connectivity service will become the mainline module.
Therefore, remove the caller of using Connectivity's
hidden API outside the module and expose the required
connectivity API used in Jobscheduler.

Bug: 183456204
CTS-Coverage-Bug: 170598012
Test: atest JobStoreTest
Change-Id: Ie6bc81ff382fb242b98f35d28a96defc207c7987
Merged-In: Ie6bc81ff382fb242b98f35d28a96defc207c7987
           (cherry-picked from ag/13946348)
2021-03-30 11:41:50 +08:00
Lorenzo Colitti
27e1d0473e Merge changes If539cf5d,I9765f1c9,I6d3007a1 am: f2babbbd67 am: e18ea6cb80 am: 34792dd0c9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652262

Change-Id: I94e5cf19a7b7dac8400cb7acf80b39a864099956
2021-03-30 02:24:00 +00:00
Lorenzo Colitti
34792dd0c9 Merge changes If539cf5d,I9765f1c9,I6d3007a1 am: f2babbbd67 am: e18ea6cb80
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652262

Change-Id: I028d1f51c9685bcc7bcaabd0339b930aa46940c6
2021-03-30 01:58:24 +00:00
Lorenzo Colitti
e18ea6cb80 Merge changes If539cf5d,I9765f1c9,I6d3007a1 am: f2babbbd67
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652262

Change-Id: Iab7a5cdb9d50314b0bdb982b88a9335b64ddb276
2021-03-30 01:14:09 +00:00
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
Lorenzo Colitti
9364b3a406 Add a setTeardownDelayMs API to NetworkAgent.
This allows transports to request that when the network is
disconnected, the system should delay destroying the native
network until the specified time has passed after the network
disconnected.

Bug: 181941583
Test: next CL in the stack
Change-Id: I9765f1c9d1e55c23c6d583d6709dbe06505975b1
2021-03-29 21:33:08 +09: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
Lorenzo Colitti
a1bd6f6d51 Address comments on onBlockedStatusChanged(Network, int) CL.
Test: m
Bug: 165835257
Change-Id: I6d3007a1eac54ee6650b350aee56ed398a2c950d
2021-03-29 20:12:09 +09:00
lucaslin
593a1b4dfa Add new network capabilities to support automotive head unit via USB
- Add a new transport type for USB and a new network capability
to support automotive head unit.
- In order to pass DnsManagerTest#testTransportTypesEqual, Android.bp
needs to link to dnsresolver_aidl_interface-V8-java. That test checks
whether the TRANSPORT types defined in NetworkCapabilities are the
same as IDnsResolver.aidl.

Bug: 181742019
Test: atest FrameworksNetTests
Change-Id: Iec2df09a776d779108f95098e01b7ffdf6f8867a
2021-03-29 10:59:06 +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
Chiachang Wang
eab4a9c984 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
Merged-In: I41e881c6fe39e92d5cdac2d0a02fa8a8e814c9c5
2021-03-26 06:17:25 +00:00
Aaron Huang
7f7c26b429 Move deduceRestrictedCapability to libs/net and rename it
NetworkCapabilities is included in framework-connectivity, so external
module cannot have dependencies on its hidden API. Move the method to
libs/net so that external modules can use it by including the library.

Bug: 178777253
Test: FrameworksNetTests
(cherry-picked from ag/13921626)
Merged-In: I77970b3a5e5e0e9d263639694b1f06519169bf64
Change-Id: I77970b3a5e5e0e9d263639694b1f06519169bf64
2021-03-26 14:13:51 +08: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