Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
637,944 Commits 3 Branches 0 Tags
50a637b1e52f0fb6728eb112c51494de55879e44
Commit Graph

6233 Commits

Author SHA1 Message Date
Yan Yan
fcadf51f2c Merge changes from topics "encrypted-tunnel-interface", "iketunnelparams", "vcn-encrypted-tunnel" am: bc545c8a8a am: 7a52d5a3eb am: 1df96ea6ac 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652997

Change-Id: If056d1a90cc4dce3882168ca23302fcd086b40ae
 2021-04-22 10:08:28 +00:00
Yan Yan
55b1e5fbf5 Convert TunnelConnectionParams to/from PersistableBundle am: c0b7c4fa5a am: e80e82bb67 am: 7a961913b2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653048

Change-Id: Idbd09b9f8a7143e586b23db47bcffcd0b82ea0c0
 2021-04-22 10:08:15 +00:00
Yan Yan
30dd69e144 Create TunnelConnectionParams interface am: 83956e2a5d am: 586eca54de am: bf54f022db 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654113

Change-Id: I76bec559bfad6b36c7533d1b76b09fc474c3883e
 2021-04-22 10:08:03 +00:00
Yan Yan
e80e82bb67 Convert TunnelConnectionParams to/from PersistableBundle am: c0b7c4fa5a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653048

Change-Id: I71e0b9735af25bb3d2f8de17df1dac3df0e10106
 2021-04-22 09:16:46 +00:00
Yan Yan
586eca54de Create TunnelConnectionParams interface am: 83956e2a5d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654113

Change-Id: I0c67adb36b0bf69729a40a46eb2dd018db308312
 2021-04-22 09:13:35 +00:00
Yan Yan
bc545c8a8a Merge changes from topics "encrypted-tunnel-interface", "iketunnelparams", "vcn-encrypted-tunnel" 
* changes:
  Replace VcnControlPlaneConfig with TunnelConnectionParams
  Convert TunnelConnectionParams to/from PersistableBundle
  Create TunnelConnectionParams interface
 2021-04-22 08:39:20 +00:00
Yan Yan
4eaa894d84 Replace VcnControlPlaneConfig with TunnelConnectionParams 
Use the more generic object TunnelConnectionParams in VCN.
TunnelConnectionParams may also be used in VPN in the future.

Test: atest FrameworksVcnTests
Bug: 180664474
Change-Id: Ie433f9df614e1f51cdff200d915b68b61e5ca35e
 2021-04-21 22:52:22 -07:00
Yan Yan
c0b7c4fa5a Convert TunnelConnectionParams to/from PersistableBundle 
Add utility class to convert TunnelConnectionParams to and from
PersistableBundle.

Bug: 180664474
Test: atest EncryptedTunnelParamsUtilsTest
Change-Id: I93ae068eb6d1e1c4d3fcbaccbaae867db8d07a38
 2021-04-21 22:49:47 -07:00
Yan Yan
83956e2a5d Create TunnelConnectionParams interface 
TunnelConnectionParams represents configurations for setting up a
secure encrypted tunnel with a remote endpoint. TunnelConnectionParams
will be used to configure a VCN and will be used for VPN configuration
in the future.

Bug: 180664474
Test: make update-api
Change-Id: Ic8e5c8535e84971517f16c54ce8b8645cfc7f944
 2021-04-21 22:48:21 -07:00
Lorenzo Colitti
609f5cff0b Merge "Hide NetworkPolicyManager.blockedReasonsToString API." am: 0549ca0217 am: fe78ceab36 am: 8027b42fe6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682220

Change-Id: If0d8f99d618173d707d2f473d4f6634c3461f0ca
 2021-04-22 03:29:41 +00:00
Aaron Huang
0924e0d9d6 Merge "Add getters to UnderlyingNetworkInfo" into sc-dev 2021-04-22 03:09:41 +00:00
Benedict Wong
fbc23c6adb Merge changes I64b56575,I40553a7b am: 80afe1eeee am: f595e45401 am: 0b3c038764 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682062

Change-Id: I50cb828d54b8f7669c33945c7cef8a366c7c316c
 2021-04-22 02:50:04 +00:00
Lorenzo Colitti
0549ca0217 Merge "Hide NetworkPolicyManager.blockedReasonsToString API." 2021-04-22 02:36:11 +00:00
Benedict Wong
80afe1eeee Merge changes I64b56575,I40553a7b 
* changes:
  Expose API for retrieval of subscription groups with VCN configured
  Add support for retrieval of configured VCNs by carrier privilege
 2021-04-22 01:31:11 +00:00
Benedict Wong
d776b3762e Expose API for retrieval of subscription groups with VCN configured 
Per API council feedback, this change adds a new API to retrieve all
subscription groups that have a VCN configured.

Bug: 184612525
Test: atest FrameworksVcnTests
Test: atest CtsVcnTestCases
Change-Id: I64b565758e0a27552eee9f860e0674db2fb35980
 2021-04-21 13:49:35 -07:00
Benedict Wong
6e8c1d6da7 Add support for retrieval of configured VCNs by carrier privilege 
This change adds support for retrieval of a list of subscription groups
that have a VCN configured.

Bug: 184612525
Test: atest FrameworksVcnTests
Change-Id: I40553a7bb45d9b1f948c7d0a791f1b22a422d55c
 2021-04-21 13:49:14 -07:00
Yan Yan
f3af46a6ec Merge "Include PORT_4500 option when encoding IkeSessionParams" am: c65ed07b59 am: 33f08103fa am: 04992800bd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682405

Change-Id: Id235ce1f89dc48a3cf3ad26ea0217573cc1aa708
 2021-04-21 19:29:43 +00:00
Yan Yan
c65ed07b59 Merge "Include PORT_4500 option when encoding IkeSessionParams" 2021-04-21 18:08:33 +00:00
Benedict Wong
cc47505d00 Merge "Rename get/setRetryInterval to get/setRetryIntervalsMs" am: 9ef01fca2a am: a746f701e2 am: 425952791a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682061

Change-Id: If957c0783fd0e7f4a6340eed8cd6e19b466048a3
 2021-04-21 17:56:41 +00:00
Aaron Huang
5d3144c977 Merge "Add getters to NetworkStateSnapshot" into sc-dev 2021-04-21 11:20:10 +00:00
Sudheer Shanka
00f344a18e Hide NetworkPolicyManager.blockedReasonsToString API. 
BLOCKED_REASON_* constants have been moved to ConnectivityManager
and blockedReasonsToString() util method doesn't belong in
NetworkPolicyManager as an API. So, just removing it for now.

Bug: 185967486
Test: treehugger
Change-Id: Ie04044980fdfc7ec772444be13fc659880953bd1
 2021-04-21 07:23:54 +00:00
Benedict Wong
85d294282c Rename get/setRetryInterval to get/setRetryIntervalsMs 
Per API feedback, the get/set methods for retry intervals are renamed to
be plural, and have time units

Bug: 184612525
Test: atest FrameworksVcnTests
Test: atest CtsVcnTestCases
Change-Id: I51b3ffcfa44f72805f359e56b263da2558325372
 2021-04-21 00:44:37 +00:00
Yan Yan
c130a2a8b1 Include PORT_4500 option when encoding IkeSessionParams 
This commit makes sure IKE_OPTION_FORCE_PORT_4500 is included
when converting IkeSessionParams to a PersistableBundle.

Bug: 185637142
Test: atest IkeSessionParamsUtilsTest
Change-Id: I1fcd6d26e64217091ad960a1c51659046e70a6ac
 2021-04-20 16:41:00 -07:00
Aaron Huang
d78c60c10a Add getters to NetworkStateSnapshot 
Address API council feedback, add getters to NetworkStateSnapshot
instead of exposing the bare fields directly.

Bug: 183972826
Test: FrameworksNetTests
Change-Id: Id1707753b42ae88d2b95e4bd00a792609434e4f5
 2021-04-20 21:55:56 +08:00
Aaron Huang
f6008978c4 Add getters to UnderlyingNetworkInfo 
Address API review feedback, add getters to UnderlyingNetworkInfo
instead of exposing fields.

Instead of wasting memory by converting this into an array, have
migrateTun take a List<String>. In turn, tunAdjustmentInit should
also take a List<String>.

Bug: 183972554
Test: atest android.net.UnderlyingNetworkInfoTest
Change-Id: Id59744097208d91298a25ef110ade91a9cf291a1
 2021-04-20 13:34:52 +08:00
Yan Yan
8dbc89396d Merge "Use #setNetwork and #getNetwork for IkeSessionParams" am: 3022c5437c am: cc0c3a5f62 am: faf572b9ee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675285

Change-Id: I94d750ce60a8caaeb221875cfa8ef3f570863ab9
 2021-04-19 19:18:22 +00:00
Yan Yan
3022c5437c Merge "Use #setNetwork and #getNetwork for IkeSessionParams" 2021-04-19 17:04:25 +00:00
Sarah Chin
7fa5d35a45 Merge "Update documentation for setSubscriptionOverride" into sc-dev 2021-04-16 23:58:42 +00:00
Paul Hu
3d41ec9b45 Merge "Add NWM#getWatchlistConfigHash to test api for testing" am: e87f10b9a6 am: 4d4af2bd05 am: b3ebae141f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675628

Change-Id: I08164c986c247fa36aa25afc533f9ad656ab8850
 2021-04-16 09:31:07 +00:00
Lorenzo Colitti
9678fd13cd Merge "Don't expose raw IBinder APIs." am: 4b4cc572c0 am: 3aba6fdd68 am: 4911a46b2c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676436

Change-Id: Ic45558c739cfb065e5c9d6fb5ebf485ceb9a630f
 2021-04-16 08:48:41 +00:00
Paul Hu
e87f10b9a6 Merge "Add NWM#getWatchlistConfigHash to test api for testing" 2021-04-16 08:10:33 +00:00
Sarah Chin
f7e9c836c4 Update documentation for setSubscriptionOverride 
Test: build
Fix: 180496714
Change-Id: Iebfcd0ece1891c1b77d132b92e93d8c1eea3aa6e
 2021-04-15 19:53:14 -07:00
Lorenzo Colitti
103e78ed48 Don't expose raw IBinder APIs. 
APIs should not expose raw IBinder objects.

Fix: 184735751
Test: builds, boots
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCases:android.net.cts.DnsResolverTest
Change-Id: Ia0c4170def31123f0b79318fec2cfe02e4fcd3bf
 2021-04-15 18:47:21 +09:00
Treehugger Robot
2d4f2324cf Merge "Make TYPE_VPN_LEGACY no longer deprecated." am: 590949fd61 am: 9d5240865f am: 0d3acacdd5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675627

Change-Id: Ib6419d4d408c5f4859bac2e92b1811dffd513c9c
 2021-04-15 05:50:32 +00:00
paulhu
675ffd271b Add NWM#getWatchlistConfigHash to test api for testing 
Bug: 185309847
Test: m update-api
Change-Id: I4fb1503827b3a9e3105c2340ffbaaa2ec593d96b
 2021-04-14 23:54:55 +08:00
Lorenzo Colitti
fb7f36b3cb Make TYPE_VPN_LEGACY no longer deprecated. 
Addresses API council feedback.

Test: m
Fix: 185311050
Change-Id: I93c8c46ceda7b08f9fc0ab8930f6a3c960f30930
 2021-04-14 23:30:48 +09:00
Benedict Wong
9dfb804a4e Convert VcnNetworkProvider to use NetworkOffers 
This change brings VcnNetworkProvider to full functionality in the new
NetworkProvider paradigm, where NetworkProviders offer networks, and are
notified based on NetworkOfferCallbacks.

Bug: 185204197
Test: atest FrameworksVcnTests
Change-Id: I88c69c0be9f6fd81839fb1595ed00341001694a5
 2021-04-14 05:41:51 +00:00
Yan Yan
66a9973b9d Use #setNetwork and #getNetwork for IkeSessionParams 
This pacth changes VCN to call #setNetwork and #getNetwork instead
of #setConfiguredNetwork and #getConfiguredNetwork because the
later two methods will not be APIs.

This patch also changes VCN unit tests to build an IkeSessionParams
without a Context because the constructor requring a Context
is deprecated.

Bug: 180521384
Test: FrameworksVcnTests, CtsVcnTestCases
Change-Id: I971d0d1b6824890c58263a1960f3b8d0e66fe7d1
 2021-04-13 21:46:53 -07:00
Paul Hu
036d189a8d Merge "Rename FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT" into sc-dev 2021-04-13 02:05:21 +00:00
paulhu
016950a485 Rename FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT 
As API review feedback, rename Build#VERSION#FIRST_SDK_INT to
Build#VERSION#DEVICE_INITIAL_SDK_INT. As well as update all usage
in frameworks and tests.

Bug: 184735771
Test: m
Change-Id: I72660959cb4e638a8e80fcf2f4e96ea172969f44
 2021-04-09 15:47:36 +08:00
Treehugger Robot
2eb331a032 Merge "Add documentation on EthernetNetworkSpecifier API" am: 682a98d823 am: 02471bd905 am: 7fa8f1fa68 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669186

Change-Id: I350d4b3d3c3b146f48480475a21b5dbe718ffc36
 2021-04-09 02:37:18 +00:00
Treehugger Robot
682a98d823 Merge "Add documentation on EthernetNetworkSpecifier API" 2021-04-09 01:26:54 +00:00
Remi NGUYEN VAN
f9dae9fec6 Add documentation on EthernetNetworkSpecifier API 
Add javadoc on the constructor and getInterfaceName method.

Fixes: 182979732
Test: m
Change-Id: Iced805149a8344b953331501b48184661be0053a
 2021-04-08 15:32:08 +09:00
Sudheer Shanka
d01e3f164d Fix an issue in NPMS where ALLOWED_REASON_SYSTEM will be ignored. 
Bug: 184701934
Test: atest services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java
Change-Id: Ic430eed075f466e1c50552053a100809a2780ba7
Merged-In: Ic430eed075f466e1c50552053a100809a2780ba7
 2021-04-07 05:11:25 +00:00
Sudheer Shanka
59041bd9f4 Fix an issue in NPMS where ALLOWED_REASON_SYSTEM will be ignored. 
Bug: 184701934
Test: atest services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java
Change-Id: Ic430eed075f466e1c50552053a100809a2780ba7
 2021-04-06 22:07:43 -07:00
Kweku Adams
9496d1170a Merge "Check network blocked reasons for job satisfaction." into sc-dev 2021-04-06 15:04:01 +00:00
Les Lee
b156dbcb90 Merge "Fix Wi-Fi SSID null handling" am: cadd76044e am: 114e0a0dd8 am: 8874e81cf7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624059

Change-Id: Iefb2bd39b51072cda3d4239e031ab00bd2e6f5c4
 2021-04-06 06:10:38 +00:00
Les Lee
cadd76044e Merge "Fix Wi-Fi SSID null handling" 2021-04-06 03:52:52 +00:00
Paul Hu
32de19f353 Merge "Remove unused method checkUidNetworkingBlocked" am: 7cd588e210 am: 88c64a0345 am: d67767b7f9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1657766

Change-Id: I069970241689bde2b615ac0fef523f155d1226f4
 2021-04-06 03:21:12 +00:00
Paul Hu
7cd588e210 Merge "Remove unused method checkUidNetworkingBlocked" 2021-04-06 01:49:57 +00:00