Commit Graph

13425 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
4f15e675cd Merge "Move net unit tests to packages/Connectivity" am: 5b48156498 am: 8c3d83c0cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706685

Change-Id: Ibe1d2241c37d2945d3e9278948d4fa614f05ae08
2021-05-13 11:51:45 +00:00
Remi NGUYEN VAN
8c3d83c0cc Merge "Move net unit tests to packages/Connectivity" am: 5b48156498
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706685

Change-Id: I86852c79cf06a3bc7b7ccaa18d83f70a2043b258
2021-05-13 11:32:36 +00:00
Remi NGUYEN VAN
0d51e44e09 Move net unit tests to packages/Connectivity
Move the tests together with packages/Connectivity code, so both can be
moved to packages/modules/Connectivity together.

Also reorganize unit tests in a unit/ directory, as other tests
(integration/, common/ etc.) have been added in tests/net since they
were created. This makes the directory structure consistent.

Test: atest FrameworksNetTests
Bug: 187814163
Merged-In: I254ffd1c08ec058d594b4ea55cbae5505f8497cc

Change-Id: I254ffd1c08ec058d594b4ea55cbae5505f8497cc
2021-05-13 08:30:33 +00:00
Paul Hu
b8df949555 Merge "Add RESTRICTED_ALLOWED_APPS setting" am: 26cc1ff94e am: 93cbfdb5ff
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689208

Change-Id: I9a30162499954c4ec3bcd97233256f973662f7ab
2021-05-13 06:19:25 +00:00
Paul Hu
93cbfdb5ff Merge "Add RESTRICTED_ALLOWED_APPS setting" am: 26cc1ff94e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689208

Change-Id: I93c004e7356559436c7dbd95716e52db8fc1ba0d
2021-05-13 05:54:31 +00:00
Paul Hu
26cc1ff94e Merge "Add RESTRICTED_ALLOWED_APPS setting" 2021-05-13 05:32:19 +00:00
Ken Chen
544e7294c1 Merge "Add testVpnTypesEqual to verify consistency" am: edeab9051e am: f16388a8f5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705385

Change-Id: Id2e9d16c88088ef5d3ffe6f698af5ee8201c7716
2021-05-13 02:45:06 +00:00
Ken Chen
31aef231ab Merge "Better log in createNativeNetwork" am: 37dec89b65 am: 4728eb0924
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704925

Change-Id: If8c106b8d0f2f71e47942a151de49daf1b65b852
2021-05-13 02:44:48 +00:00
Ken Chen
05f062fb64 Merge "Switch from networkCreate[Physical/Vpn] to networkCreate" am: a0b65e1870 am: aa243fe3ba
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669648

Change-Id: Iec819a213f8c0daf50cdfdd5d580234ee5f8de68
2021-05-13 02:44:30 +00:00
paulhu
d82ece857d Add RESTRICTED_ALLOWED_APPS setting
This setting is OEM upstream requirement for third party apps
using restricted networks.

Bug: 185149952
Test: atests FrameworksNetTests
Change-Id: I5e16b46cf2935f38ee1e516bb8b85fa487cf9f61
2021-05-13 10:09:31 +08:00
Ken Chen
f16388a8f5 Merge "Add testVpnTypesEqual to verify consistency" am: edeab9051e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705385

Change-Id: I18b5716252efc4f7c33ec8263c09df1f9396d1fe
2021-05-13 02:05:37 +00:00
Ken Chen
4728eb0924 Merge "Better log in createNativeNetwork" am: 37dec89b65
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704925

Change-Id: Ic8afb71d7ac099f6c492dda8f9f54a5da3c79649
2021-05-13 02:01:21 +00:00
Ken Chen
aa243fe3ba Merge "Switch from networkCreate[Physical/Vpn] to networkCreate" am: a0b65e1870
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669648

Change-Id: Ia7b8d56ee75194cfe289dbb3e73667f43344cda3
2021-05-13 01:34:23 +00:00
Ken Chen
edeab9051e Merge "Add testVpnTypesEqual to verify consistency" 2021-05-13 01:22:08 +00:00
Ken Chen
37dec89b65 Merge "Better log in createNativeNetwork" 2021-05-13 01:21:47 +00:00
Ken Chen
a0b65e1870 Merge "Switch from networkCreate[Physical/Vpn] to networkCreate" 2021-05-13 01:20:39 +00:00
Lucas Lin
c3ab7b66d3 Merge "Update PrivateDnsMode from StringDef to IntDef" am: 0604a2e93e am: 735250d758
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675562

Change-Id: I0b2ad20c59397395175b82688cfe657af43a1b19
2021-05-12 17:59:57 +00:00
Lucas Lin
8ca73028d2 [automerger skipped] Merge "Remove sendNetworkConditionsBroadcast" into rvc-dev am: 542d796a9f am: 36fa4a55b4 -s ours
am skip reason: Merged-In I7b43940dc32826c70fa82f471b35bc5cb8394aad with SHA-1 d6f8dbd75b is already in history

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

Change-Id: I27cd7672349c0f1f4c4831c3c3cab720720ac373
2021-05-12 17:59:35 +00:00
Lucas Lin
735250d758 Merge "Update PrivateDnsMode from StringDef to IntDef" am: 0604a2e93e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675562

Change-Id: I391d8dd2615f090d3112af69248aea70e334f62f
2021-05-12 17:23:45 +00:00
Lucas Lin
36fa4a55b4 Merge "Remove sendNetworkConditionsBroadcast" into rvc-dev am: 542d796a9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14455604

Change-Id: I4a64821743d6ee4e4ae9b9d2759e38369cde5656
2021-05-12 17:21:55 +00:00
Lucas Lin
0604a2e93e Merge "Update PrivateDnsMode from StringDef to IntDef" 2021-05-12 17:09:50 +00:00
Chalard Jean
6e2a3affcc Merge "Allow any transport with TEST if the network is restricted" am: 03de4e884b am: e32987bcb9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702489

Change-Id: I8b42aa698f279774b8d5781811dc848c7d7ff713
2021-05-12 14:33:13 +00:00
Chalard Jean
e32987bcb9 Merge "Allow any transport with TEST if the network is restricted" am: 03de4e884b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702489

Change-Id: Ic688c9d328242962c57631632b33236a69852ed6
2021-05-12 14:29:56 +00:00
Remi NGUYEN VAN
126dfaf776 Merge "Use jniThrowErrnoException from JNIHelp" am: 60ce73bdc5 am: cb58eb4732
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703087

Change-Id: I52864a1dff894d827e97332ce9ddd506ae297270
2021-05-12 14:25:42 +00:00
Remi NGUYEN VAN
169d66303b Merge "Move NetworkUtils JNI out of core/jni" am: 8842198f2e am: ba0f6837cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703086

Change-Id: Icc10740c6f18755a86d4f3cc9fb59bcb6a933910
2021-05-12 14:25:23 +00:00
Remi NGUYEN VAN
32df5aa7bb Merge "Build framework-connectivity using module_current" am: 40d3b1fbea am: 6e64634da0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703085

Change-Id: I47046e76bab062d0f887f2f965c054054acba0c5
2021-05-12 14:25:00 +00:00
Remi NGUYEN VAN
cb58eb4732 Merge "Use jniThrowErrnoException from JNIHelp" am: 60ce73bdc5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703087

Change-Id: I6a1d75a1792883a7dc96c1beb108e83653c668a0
2021-05-12 14:17:28 +00:00
Remi NGUYEN VAN
ba0f6837cc Merge "Move NetworkUtils JNI out of core/jni" am: 8842198f2e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703086

Change-Id: Icd812cda9e75015093080126bd20210034af5839
2021-05-12 14:13:20 +00:00
Remi NGUYEN VAN
6e64634da0 Merge "Build framework-connectivity using module_current" am: 40d3b1fbea
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703085

Change-Id: I67461b530e5292f94e3e1426ff0ec93ea657cf21
2021-05-12 14:05:55 +00:00
Chalard Jean
03de4e884b Merge "Allow any transport with TEST if the network is restricted" 2021-05-12 13:57:31 +00:00
Remi NGUYEN VAN
60ce73bdc5 Merge "Use jniThrowErrnoException from JNIHelp" 2021-05-12 13:12:32 +00:00
Remi NGUYEN VAN
8842198f2e Merge "Move NetworkUtils JNI out of core/jni" 2021-05-12 13:12:09 +00:00
Remi NGUYEN VAN
40d3b1fbea Merge "Build framework-connectivity using module_current" 2021-05-12 13:11:22 +00:00
Chiachang Wang
7e3fb2c18a Merge "Remove sendNetworkConditionsBroadcast" am: 536e82f56b am: d37e995263
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702485

Change-Id: Ib6299c1022f196453aa6f072bcc9ba7227bfe8f4
2021-05-12 10:04:29 +00:00
Chiachang Wang
d37e995263 Merge "Remove sendNetworkConditionsBroadcast" am: 536e82f56b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702485

Change-Id: I858f2364a40d409981b88946887f9619f11cdce4
2021-05-12 09:57:07 +00:00
Lorenzo Colitti
bcede3e59b Merge "Rename unwanted capabilities to forbidden capabilities." am: dacc5e5f93 am: a50875391b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687485

Change-Id: I9b8a61b4c4a0059af294c2575e5339e7e3b9f3ed
2021-05-12 09:56:38 +00:00
Paul Hu
d59739e116 Merge "Add MATCH_ANY_USER flag to PackageInfo queries" am: eda29f73aa am: 8f03d96e83
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689207

Change-Id: I44318046f675749fe056fa253da3d48c88129441
2021-05-12 09:56:19 +00:00
Ken Chen
4812a3ab7a Add testVpnTypesEqual to verify consistency
VPN types are defined in both VpnManager.java and NativeVpnType.aidl.
The definitions on both sides should match (except TYPE_VPN_NONE).

VpnManager.java:
TYPE_VPN_NONE = -1
TYPE_VPN_SERVICE = 1
TYPE_VPN_PLATFORM = 2
TYPE_VPN_LEGACY = 3
TYPE_VPN_OEM = 4

NativeVpnType.aidl:
SERVICE = 1
PLATFORM = 2
LEGACY = 3
OEM = 4

Bug: N/A
Test: atest android.net.VpnManagerTest#testVpnTypesEqual
Change-Id: Ie618e227d861100c5318da696140e486af1093a0
2021-05-12 17:34:34 +08:00
Chiachang Wang
536e82f56b Merge "Remove sendNetworkConditionsBroadcast" 2021-05-12 09:24:02 +00:00
Lorenzo Colitti
a50875391b Merge "Rename unwanted capabilities to forbidden capabilities." am: dacc5e5f93
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687485

Change-Id: Iaf8da730305ed7294cc624d4d41b0a11f2872863
2021-05-12 09:15:30 +00:00
Lorenzo Colitti
dacc5e5f93 Merge "Rename unwanted capabilities to forbidden capabilities." 2021-05-12 09:00:17 +00:00
Paul Hu
8f03d96e83 Merge "Add MATCH_ANY_USER flag to PackageInfo queries" am: eda29f73aa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689207

Change-Id: Ie4878f35faf62b15c95dc93951b9fa8f868642c4
2021-05-12 07:41:00 +00:00
Paul Hu
eda29f73aa Merge "Add MATCH_ANY_USER flag to PackageInfo queries" 2021-05-12 07:13:17 +00:00
Ken Chen
4e6ae315ac Better log in createNativeNetwork
Dump more information from NetworkAgentInfo in error log.

Bug: N/A
Test: m
Change-Id: I92981c03ad80e8b1d7ffaf45d50cc0bfd0b283b0
2021-05-12 13:44:40 +08:00
David Su
197900e62e Merge "Emphasize possibility of multiple networks with same transport" am: 74adc3a813 am: a7472710a5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620459

Change-Id: If641ab6d8ab300048c5666eea399e3ab8404d826
2021-05-11 16:48:03 +00:00
David Su
a7472710a5 Merge "Emphasize possibility of multiple networks with same transport" am: 74adc3a813
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620459

Change-Id: I5ce97c2040817b68c6b70640db22d5d04bb304f3
2021-05-11 16:10:55 +00:00
David Su
74adc3a813 Merge "Emphasize possibility of multiple networks with same transport" 2021-05-11 15:51:28 +00:00
Remi NGUYEN VAN
bf0edd457f Use jniThrowErrnoException from JNIHelp
Use the jniThrowErrnoException that is available in JNIHelp, instead of
reimplementing in NetworkUtils.

Bug: 179229316
Test: device boots and has connectivity
Merged-In: I257a9d55ce1f5a7c588e209b4a89d3e7a3e09994

Change-Id: I257a9d55ce1f5a7c588e209b4a89d3e7a3e09994
2021-05-11 14:18:27 +00:00
Remi NGUYEN VAN
40330008c3 Move NetworkUtils JNI out of core/jni
Keep the utilities included via a library, but move them out of
core/jni, and prepare a library to package them together with
framework-connectivity.

Also remove unnecessary dependencies in framework-connectivity.

Bug: 171540887
Test: device boots and has connectivity

Merged-In: I0b55dfe92f3cb6e848d79ac7953756f39aaa2597

Change-Id: I0b55dfe92f3cb6e848d79ac7953756f39aaa2597
2021-05-11 13:02:39 +00:00
Remi NGUYEN VAN
472d13d498 Build framework-connectivity using module_current
framework-connectivity needs to build only against stable APIs.

Bug: 171540887
Test: m framework-connectivity.impl
Merged-In: I2d51d37d067bf6fe86e4dedf05855a2dd67ed57c

Change-Id: I2d51d37d067bf6fe86e4dedf05855a2dd67ed57c
2021-05-11 13:00:42 +00:00