paulhu
bce84c9a66
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
2021-03-26 04:36:06 +00:00
paulhu
578821f72d
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
2021-03-26 04:36:02 +00:00
paulhu
43944db404
Add PRIVATE_DNS_MODE setting setter am: 87ac58016f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654014
Change-Id: I97de83147a0c656802601ec116ee9ee7de114884
2021-03-26 03:58:53 +00:00
paulhu
df6a143255
Expose ConnectivitySettingsManager as module-lib API am: e6badefc33
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654013
Change-Id: I6b53ced3ed523f984dde3c5b24cd53f832284da0
2021-03-26 03:54:38 +00:00
paulhu
87ac58016f
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
e6badefc33
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
06b2fd7114
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
2021-03-25 14:22:19 +00:00
Chiachang Wang
cc030c76f5
Merge "Add network created callback support" am: c542ed20fa
...
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
c542ed20fa
Merge "Add network created callback support"
2021-03-25 13:22:17 +00:00
Lucas Lin
4b44bfce87
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
2021-03-25 12:39:43 +00:00
Lucas Lin
82131f1f82
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
2021-03-25 12:39:18 +00:00
Lucas Lin
59d8bd7380
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
2021-03-25 12:38:47 +00:00
Lucas Lin
b4ac20f26b
Merge "Add annotation for Vpn#getNetwork()" am: 3483ccf883
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653946
Change-Id: I3be5109c253365b3c5bc56ae48114f8e37c4f153
2021-03-25 12:30:18 +00:00
Lucas Lin
22f8ded94a
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
2021-03-25 12:25:42 +00:00
Lucas Lin
fa31b5bfe8
Merge changes Ic2357dcf,Iddf8c71a am: 29ed3efbfe am: 6cece1f221
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653939
Change-Id: Icf3acbfb071fc2d24f0d31c719446604567e2281
2021-03-25 12:23:01 +00:00
lucaslin
c76b482ada
Expose NetworkScore to external caller am: 026a987e1e am: e1f3a8b1da
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653938
Change-Id: I807cae8d95e8d5fb1f017b1ba11d800772ba3e9c
2021-03-25 12:22:59 +00:00
Lucas Lin
cc2827494a
Merge "Expose some APIs from ConnectivityManager" am: bcf2a79ec8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653936
Change-Id: I1a31a6162d5098770c0d5b19faa7af83553f6a2e
2021-03-25 12:17:18 +00:00
Lucas Lin
6cece1f221
Merge changes Ic2357dcf,Iddf8c71a am: 29ed3efbfe
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653939
Change-Id: I9c5f96893488f1e103cba740a0bbfb474ffe90b9
2021-03-25 12:07:49 +00:00
lucaslin
e1f3a8b1da
Expose NetworkScore to external caller am: 026a987e1e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653938
Change-Id: I5f2fb6bb6f2de4d81fb3b750053ee5abbe82caeb
2021-03-25 11:53:29 +00:00
Lucas Lin
3483ccf883
Merge "Add annotation for Vpn#getNetwork()"
2021-03-25 11:29:38 +00:00
Lucas Lin
0f114dff28
Merge "Remove the usage of NETID_UNSET from Vpn.java"
2021-03-25 11:29:17 +00:00
Lucas Lin
bcf2a79ec8
Merge "Expose some APIs from ConnectivityManager"
2021-03-25 11:29:08 +00:00
Lucas Lin
29ed3efbfe
Merge changes Ic2357dcf,Iddf8c71a
...
* changes:
Expose NetworkAgent constructor taking a NetworkScore parameter
Expose NetworkScore to external caller
2021-03-25 11:28:28 +00:00
Chiachang Wang
fb0d390e6f
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
2021-03-25 18:27:24 +08:00
lucaslin
150976c603
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)
2021-03-25 10:21:07 +00:00
lucaslin
6b49587384
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)
2021-03-25 10:19:05 +00:00
Chiachang Wang
823542095f
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)
2021-03-25 08:40:27 +00:00
lucaslin
026a987e1e
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)
2021-03-25 08:15:09 +00:00
lucaslin
2e68aa2e7a
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)
2021-03-25 08:07:53 +00:00
Treehugger Robot
fcf54cf966
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
2021-03-25 02:36:19 +00:00
Treehugger Robot
7ffa156a73
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
2021-03-25 01:53:51 +00:00
Treehugger Robot
f652408e6c
Merge "Use a longer test timeout in integration test"
2021-03-25 01:24:51 +00:00
Jayachandran Chinnakkannu
3bad6f9856
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
2021-03-24 18:54:17 +00:00
Treehugger Robot
688f015e64
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
2021-03-24 18:53:30 +00:00
Jayachandran Chinnakkannu
6ed7c1c523
Merge "Add 5G/NR QOS support" am: df448f6eaa
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643762
Change-Id: Icd4c21b9731256c9b3d39bffc5fddc43276c5fda
2021-03-24 18:26:19 +00:00
Treehugger Robot
c97c779c98
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
2021-03-24 18:13:19 +00:00
Jayachandran Chinnakkannu
df448f6eaa
Merge "Add 5G/NR QOS support"
2021-03-24 17:44:48 +00:00
Treehugger Robot
eb3ba19447
Merge "Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager."
2021-03-24 17:22:50 +00:00
Sudheer Shanka
04aab0f60f
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
2021-03-25 01:33:26 +09:00
Jayachandran C
8ae3bf3f92
Add 5G/NR QOS support
...
Bug: 155176305
Bug: 182317794
Test: atest ConnectivityServiceTest
atest QosCallbackTrackerTest
Change-Id: Idf6d8a7c3b80bc50a2c1244ceaefea9381d40c2f
2021-03-23 19:14:21 -07:00
Junyu Lai
b5d62d1f83
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
2021-03-23 13:29:15 +00:00
Junyu Lai
f85195ae06
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
2021-03-23 12:46:45 +00:00
Junyu Lai
3ef6584f1b
Merge "Fix cannot find removeUnwantedCapability on R device"
2021-03-23 12:16:18 +00:00
Chiachang Wang
b948cc3ba0
Merge "Correct the logic in NetworkCapabilitiesTest" am: 2848cdf348 am: 06238861b5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649297
Change-Id: I224e3c120ac07677d80396247f5b9e74c1bfd1a4
2021-03-23 12:10:57 +00:00
Chiachang Wang
5898f562ed
Merge "Add NetworkRequest.Builder creating from an existing instance" am: 08bebe4609 am: eefea38ae5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649294
Change-Id: I96516eb0d976d6e6250d2e96c316c560bfa21ab5
2021-03-23 12:09:42 +00:00
Chiachang Wang
06238861b5
Merge "Correct the logic in NetworkCapabilitiesTest" am: 2848cdf348
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649297
Change-Id: I32bc9ee2db0b192513f782455a91d7336875a039
2021-03-23 12:07:47 +00:00
Chiachang Wang
2848cdf348
Merge "Correct the logic in NetworkCapabilitiesTest"
2021-03-23 11:46:31 +00:00
Chiachang Wang
eefea38ae5
Merge "Add NetworkRequest.Builder creating from an existing instance" am: 08bebe4609
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649294
Change-Id: Ib990cb25d50c11b103e248c0c13c584e78aa3450
2021-03-23 11:36:07 +00:00
Chiachang Wang
08bebe4609
Merge "Add NetworkRequest.Builder creating from an existing instance"
2021-03-23 10:46:20 +00:00
junyulai
1ed0b04410
Fix cannot find removeUnwantedCapability on R device
...
Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkCapabilitiesTest
Fix: 183473863
Merged-In: Icf2cda325795acee22a6c634e8d978f64c5ac3cb
Change-Id: Icf2cda325795acee22a6c634e8d978f64c5ac3cb
(cherry-picked from ag/13966708)
2021-03-23 17:40:55 +08:00