Commit graph

13,045 commits

Message SHA1
Merge changes from topic "blocked-reasons-callback-tests" am: 2108a92452 am: 7de5bd543e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652214

Change-Id: Ie51249f5fa47b0a5afe287083139082488f9b503

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2021-03-26 04:36:19 +00:00
994e2cedb1
Add MOBILE_DATA_PREFERRED_APPS setting am: 521169738c am: 26611dc3d3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654015

Change-Id: I25b39c8f35dd80d13775c4a9c5074b2cd8c9f297

paulhu   authored and   Automerger Merge Worker   commited 2021-03-26 04:36:10 +00:00
01c795ec5c
Add PRIVATE_DNS_MODE setting setter am: 87ac58016f am: 43944db404
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654014

Change-Id: Iddc394112f17b3e4264a42c6326148833efe9297

paulhu   authored and   Automerger Merge Worker   commited 2021-03-26 04:36:06 +00:00
bce84c9a66
Expose ConnectivitySettingsManager as module-lib API am: e6badefc33 am: df6a143255
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654013

Change-Id: I0d623f62c2e5d4c975f74b1efed24bdf5cc7c669

paulhu   authored and   Automerger Merge Worker   commited 2021-03-26 04:36:02 +00:00
578821f72d
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

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2021-03-26 04:04:27 +00:00
7de5bd543e
Add MOBILE_DATA_PREFERRED_APPS setting am: 521169738c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654015

Change-Id: I4d5c5cfaa2a35a6919517c6e5737fffdd0f217f3

paulhu   authored and   Automerger Merge Worker   commited 2021-03-26 04:02:02 +00:00
26611dc3d3
Add PRIVATE_DNS_MODE setting setter am: 87ac58016f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654014

Change-Id: I97de83147a0c656802601ec116ee9ee7de114884

paulhu   authored and   Automerger Merge Worker   commited 2021-03-26 03:58:53 +00:00
43944db404
Expose ConnectivitySettingsManager as module-lib API am: e6badefc33
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654013

Change-Id: I6b53ced3ed523f984dde3c5b24cd53f832284da0

paulhu   authored and   Automerger Merge Worker   commited 2021-03-26 03:54:38 +00:00
df6a143255
Add unit tests for onBlockedStatusChanged(Network, int).
Bug: 165835257
Test: atest FrameworksNetTests
Change-Id: I0597df71aa94817835d7a2fb54bfcf9222a34b64

Lorenzo Colitti   commited 2021-03-26 02:37:20 +09:00
9150b1ec95
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

paulhu   authored and   Lorenzo Colitti   commited 2021-03-26 02:37:19 +09:00
521169738c
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

Lorenzo Colitti   commited 2021-03-26 02:37:19 +09:00
60104f59a0
Add PRIVATE_DNS_MODE setting setter
Bug: 182538166
Test: atest FrameworksNetTests
Merged-In: If234426f041606c4881de1eca31b6f5bdb3c6bfe
Change-Id: Iaa9e6cc92f1805ab341c308fc60e947ec4c674f0

paulhu   authored and   Lorenzo Colitti   commited 2021-03-26 02:37:16 +09:00
87ac58016f
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

paulhu   authored and   Lorenzo Colitti   commited 2021-03-26 02:35:07 +09:00
e6badefc33
Merge "Add network created callback support" am: c542ed20fa am: cc030c76f5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652209

Change-Id: Ia98837b70d22f5c15db77c54d58e142967bdd814

Chiachang Wang   authored and   Automerger Merge Worker   commited 2021-03-25 14:22:19 +00:00
06b2fd7114
Merge "Add network created callback support" am: c542ed20fa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652209

Change-Id: Ibd2d575b5e3bdfc164c4721bc5bbb0c8b90601e0

Chiachang Wang   authored and   Automerger Merge Worker   commited 2021-03-25 13:42:54 +00:00
cc030c76f5
Merge "Add network created callback support"
Chiachang Wang   authored and   Gerrit Code Review   commited 2021-03-25 13:22:17 +00:00
c542ed20fa
Merge "Add annotation for Vpn#getNetwork()" am: 3483ccf883 am: b4ac20f26b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653946

Change-Id: Iaad97aa7b05f7583fc740d0bdaeffd8f23566086

Lucas Lin   authored and   Automerger Merge Worker   commited 2021-03-25 12:39:43 +00:00
4b44bfce87
Merge "Remove the usage of NETID_UNSET from Vpn.java" am: 0f114dff28 am: 22f8ded94a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653929

Change-Id: I5e2dbb8cc31939b1fdc8abc785cb43e9519513af

Lucas Lin   authored and   Automerger Merge Worker   commited 2021-03-25 12:39:18 +00:00
82131f1f82
Merge "Expose some APIs from ConnectivityManager" am: bcf2a79ec8 am: cc2827494a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653936

Change-Id: I9dac472715fc8f32cb6313f2df8aef872bec9632

Lucas Lin   authored and   Automerger Merge Worker   commited 2021-03-25 12:38:47 +00:00
59d8bd7380
Merge "Add annotation for Vpn#getNetwork()" am: 3483ccf883
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653946

Change-Id: I3be5109c253365b3c5bc56ae48114f8e37c4f153

Lucas Lin   authored and   Automerger Merge Worker   commited 2021-03-25 12:30:18 +00:00
b4ac20f26b
Merge "Remove the usage of NETID_UNSET from Vpn.java" am: 0f114dff28
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653929

Change-Id: Ic50dee391e123b9e9debb8e77bac1f0499d939f1

Lucas Lin   authored and   Automerger Merge Worker   commited 2021-03-25 12:25:42 +00:00
22f8ded94a
Merge changes Ic2357dcf,Iddf8c71a am: 29ed3efbfe am: 6cece1f221
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653939

Change-Id: Icf3acbfb071fc2d24f0d31c719446604567e2281

Lucas Lin   authored and   Automerger Merge Worker   commited 2021-03-25 12:23:01 +00:00
fa31b5bfe8
Expose NetworkScore to external caller am: 026a987e1e am: e1f3a8b1da
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653938

Change-Id: I807cae8d95e8d5fb1f017b1ba11d800772ba3e9c

lucaslin   authored and   Automerger Merge Worker   commited 2021-03-25 12:22:59 +00:00
c76b482ada
Merge "Expose some APIs from ConnectivityManager" am: bcf2a79ec8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653936

Change-Id: I1a31a6162d5098770c0d5b19faa7af83553f6a2e

Lucas Lin   authored and   Automerger Merge Worker   commited 2021-03-25 12:17:18 +00:00
cc2827494a
Merge changes Ic2357dcf,Iddf8c71a am: 29ed3efbfe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653939

Change-Id: I9c5f96893488f1e103cba740a0bbfb474ffe90b9

Lucas Lin   authored and   Automerger Merge Worker   commited 2021-03-25 12:07:49 +00:00
6cece1f221
Expose NetworkScore to external caller am: 026a987e1e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653938

Change-Id: I5f2fb6bb6f2de4d81fb3b750053ee5abbe82caeb

lucaslin   authored and   Automerger Merge Worker   commited 2021-03-25 11:53:29 +00:00
e1f3a8b1da
Merge "Add annotation for Vpn#getNetwork()"
Lucas Lin   authored and   Gerrit Code Review   commited 2021-03-25 11:29:38 +00:00
3483ccf883
Merge "Remove the usage of NETID_UNSET from Vpn.java"
Lucas Lin   authored and   Gerrit Code Review   commited 2021-03-25 11:29:17 +00:00
0f114dff28
Merge "Expose some APIs from ConnectivityManager"
Lucas Lin   authored and   Gerrit Code Review   commited 2021-03-25 11:29:08 +00:00
bcf2a79ec8
Merge changes Ic2357dcf,Iddf8c71a
* changes:
  Expose NetworkAgent constructor taking a NetworkScore parameter
  Expose NetworkScore to external caller

Lucas Lin   authored and   Gerrit Code Review   commited 2021-03-25 11:28:28 +00:00
29ed3efbfe
Add network created callback support
Create a network callback to notify network agent after
netd has created the network, so that the NetworkAgent may
wait for this callback and ensure the pre-work to communicate
with netd completed.

Bug: 178725261
Test: make update-api
Change-Id: I8c2ff7bd6980ae838abc5669f9419d62741b8666
Merged-In: I8c2ff7bd6980ae838abc5669f9419d62741b8666

Chiachang Wang   commited 2021-03-25 18:27:24 +08:00
fb0d390e6f
Add annotation for Vpn#getNetwork()
- Add @VisibleForTesting & @Nullable for Vpn#getNetwork().
- Remove null check in caller side(test) of Vpn#getNetwork()
because if the code is working properly, it can never be null.

Bug: 182963397
Test: atest FrameworksNetTests
Change-Id: Ic52864003fbebd9f4e95d43fefc2e168437b0122
Merged-In: Ic52864003fbebd9f4e95d43fefc2e168437b0122
  (cherry-picked from ag/13946573)

lucaslin   authored and   Lucas Lin   commited 2021-03-25 10:21:07 +00:00
150976c603
Remove the usage of NETID_UNSET from Vpn.java
Modify Vpn#getNetId() to Vpn#getNetwork() and uses NETID_UNSET
when getNetwork() returns null in ConnectivityServiceTest.

Bug: 182963397
Test: atest FrameworksNetTests
Change-Id: I69d449705b1dc541287c72af8dc7705dc4733109
Merged-In: I69d449705b1dc541287c72af8dc7705dc4733109
  (cherry-picked from ag/13927650)

lucaslin   authored and   Lucas Lin   commited 2021-03-25 10:19:05 +00:00
6b49587384
Expose NetworkAgent constructor taking a NetworkScore parameter
Vpn constructs NetworkAgent with this exposed NetworkAgent
constructor. Given NetworkAgent is moving into the incoming
connectivity module, Vpn which is outside the module will not
be able to access it if it's not in the API surface. Thus,
expose it to allow Vpn to use it.

Bug: 182963397
Test: make update-api
Change-Id: Ic2357dcfff3233e0dd17b48b0e376a5095ef60fa
Merged-In: Ic2357dcfff3233e0dd17b48b0e376a5095ef60fa
CTS-Coverage-Bug: 172183305
  (cherry-picked from ag/13966707)

Chiachang Wang   authored and   Lucas Lin   commited 2021-03-25 08:40:27 +00:00
823542095f
Expose NetworkScore to external caller
NetworkScore will be a part of mainline module, so the external
callers cannot call its hidden APIs. Expose needed APIs to
the external callers.

CTS-Coverage-Bug: 182963397
Bug: 182963397
Test: m
Change-Id: Iddf8c71a5f51a40bc6ff78626b3e8ee530d1b7eb
Merged-In: Iddf8c71a5f51a40bc6ff78626b3e8ee530d1b7eb
  (cherry-picked from ag/13947595)

lucaslin   authored and   Lucas Lin   commited 2021-03-25 08:15:09 +00:00
026a987e1e
Expose some APIs from ConnectivityManager
- Expose setRequireVpnForUids to Vpn.java
- Expose setLegacyLockdownVpnEnabled to LockdownVpnTracker.java
- Expose requestRouteToHostAddress to
  GnssNetworkConnectivityHandler.java

Bug: 182963397
Test: m
Change-Id: I1fb5ecfbe37878ba3534e6c6c7599ca29db2735c
Merged-In: I1fb5ecfbe37878ba3534e6c6c7599ca29db2735c
  (cherry-picked from ag/13927657)

lucaslin   authored and   Lucas Lin   commited 2021-03-25 08:07:53 +00:00
2e68aa2e7a
Merge "Use a longer test timeout in integration test" am: f652408e6c am: 7ffa156a73
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650287

Change-Id: Iac1fdb3d92501b292ecbff1f9a75bcecbcb23725

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-03-25 02:36:19 +00:00
fcf54cf966
Merge "Use a longer test timeout in integration test" am: f652408e6c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650287

Change-Id: Ia76f196039f7d748f47bd4e9a62eb59c8ad1b116

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-03-25 01:53:51 +00:00
7ffa156a73
Merge "Use a longer test timeout in integration test"
Treehugger Robot   authored and   Gerrit Code Review   commited 2021-03-25 01:24:51 +00:00
f652408e6c
Merge "Add 5G/NR QOS support" am: df448f6eaa am: 6ed7c1c523
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643762

Change-Id: If32e710cfea988dbaa438ffee547707aa06e6545

Jayachandran Chinnakkannu   authored and   Automerger Merge Worker   commited 2021-03-24 18:54:17 +00:00
3bad6f9856
Merge "Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager." am: eb3ba19447 am: c97c779c98
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651532

Change-Id: I99fe564e3fd7e6e92416a3d76054e62969cdd48f

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-03-24 18:53:30 +00:00
688f015e64
Merge "Add 5G/NR QOS support" am: df448f6eaa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643762

Change-Id: Icd4c21b9731256c9b3d39bffc5fddc43276c5fda

Jayachandran Chinnakkannu   authored and   Automerger Merge Worker   commited 2021-03-24 18:26:19 +00:00
6ed7c1c523
Merge "Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager." am: eb3ba19447
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651532

Change-Id: If272068940e9a06efbb40149e2b4dd5fbb1185d6

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-03-24 18:13:19 +00:00
c97c779c98
Merge "Add 5G/NR QOS support"
Jayachandran Chinnakkannu   authored and   Gerrit Code Review   commited 2021-03-24 17:44:48 +00:00
df448f6eaa
Merge "Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager."
Treehugger Robot   authored and   Gerrit Code Review   commited 2021-03-24 17:22:50 +00:00
eb3ba19447
Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager.
These constants will now be including all the reasons for why an
uid's network access can be blocked, instead of only the
restrictions that could be imposed by NPMS.

Bug: 183473548
Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Merged-In: I4c544415e12adf442fd2415c371b1b70a39c3aa4
Change-Id: I6dcea43fbefa9eac8b5a971b822a5be5422a54b4

Sudheer Shanka   authored and   Lorenzo Colitti   commited 2021-03-25 01:33:26 +09:00
04aab0f60f
Add 5G/NR QOS support
Bug: 155176305
Bug: 182317794
Test: atest ConnectivityServiceTest
      atest QosCallbackTrackerTest

Change-Id: Idf6d8a7c3b80bc50a2c1244ceaefea9381d40c2f

Jayachandran C   commited 2021-03-23 19:14:21 -07:00
8ae3bf3f92
Merge "Fix cannot find removeUnwantedCapability on R device" am: 3ef6584f1b am: f85195ae06
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649302

Change-Id: Ia574c52344290f5baf5fbee90ed1f6f7c7e0f92c

Junyu Lai   authored and   Automerger Merge Worker   commited 2021-03-23 13:29:15 +00:00
b5d62d1f83
Merge "Fix cannot find removeUnwantedCapability on R device" am: 3ef6584f1b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649302

Change-Id: I11ee0a8d6388f78a9db90756c0cbee93c923e1b8

Junyu Lai   authored and   Automerger Merge Worker   commited 2021-03-23 12:46:45 +00:00
f85195ae06
Merge "Fix cannot find removeUnwantedCapability on R device"
Junyu Lai   authored and   Gerrit Code Review   commited 2021-03-23 12:16:18 +00:00
3ef6584f1b