Lorenzo Colitti
f130c6ddf0
[automerger skipped] Merge changes Ia5bc896c,I0c9406f4,I3108ee94 am: dff00cd42b am: e85055d0a8 am: 8ff101f540 -s ours
...
am skip reason: skipped by user lorenzo
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705389
Change-Id: Icc5d80d32409711650384577150e9d309788b001
2021-05-13 17:01:54 +00:00
Lorenzo Colitti
8ff101f540
Merge changes Ia5bc896c,I0c9406f4,I3108ee94 am: dff00cd42b am: e85055d0a8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705389
Change-Id: Ie2c28214c2158f49b6282d398ac41038014972bf
2021-05-13 15:51:59 +00:00
Lorenzo Colitti
e85055d0a8
Merge changes Ia5bc896c,I0c9406f4,I3108ee94 am: dff00cd42b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705389
Change-Id: I30c22bae1e2df6497483fd863396f2abb6def278
2021-05-13 15:30:59 +00:00
Remi NGUYEN VAN
499925d594
Merge "Move connectivity sources to packages/Connectivity" into sc-dev
2021-05-13 15:22:20 +00:00
Lorenzo Colitti
dff00cd42b
Merge changes Ia5bc896c,I0c9406f4,I3108ee94
...
* changes:
Make VcnTransportInfoTest pass on AOSP.
Immediately redact VcnTransportInfo.
Do not automatically redact TransportInfo objects.
2021-05-13 15:11:01 +00:00
Paul Hu
d3f33f364a
Merge "Update mobile data preference getter/setter" am: d0b2ba479b am: 6d5c51149c am: 7e6d9da39e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702486
Change-Id: Ib55aaba8c8afc8a3152d83932bf345277bda35f9
2021-05-13 14:53:21 +00:00
Paul Hu
7e6d9da39e
Merge "Update mobile data preference getter/setter" am: d0b2ba479b am: 6d5c51149c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702486
Change-Id: I950d4f95759fe17e2164014ab016d39d46ad5539
2021-05-13 14:29:43 +00:00
Paul Hu
6d5c51149c
Merge "Update mobile data preference getter/setter" am: d0b2ba479b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702486
Change-Id: Ieb72b4f0284d5439f62037b9d68da054f276120d
2021-05-13 14:07:56 +00:00
Paul Hu
d0b2ba479b
Merge "Update mobile data preference getter/setter"
2021-05-13 13:42:05 +00:00
Remi NGUYEN VAN
c0b5ead56d
Move connectivity sources to packages/Connectivity
...
The service-connectivity sources should be in
packages/modules/Connectivity. Move them to
frameworks/base/packages/Connectivity, so that the whole directory can
be moved to the dedicated packages/modules/Connectivity git project.
Bug: 186628461
Test: m
Change-Id: I26d1a274058fa38763ad4f605549d880865b4d76
2021-05-13 12:44:09 +00:00
Remi NGUYEN VAN
69cb94c88e
[automerger skipped] Merge "Move net unit tests to packages/Connectivity" am: 5b48156498 am: 8c3d83c0cc am: 4f15e675cd -s ours
...
am skip reason: Merged-In I254ffd1c08ec058d594b4ea55cbae5505f8497cc with SHA-1 65b8995a15 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706685
Change-Id: I8d08b8919e4b0dc129363e3e715374b22c4a3c0d
2021-05-13 12:08:41 +00:00
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
Lorenzo Colitti
e61ffc1a50
Do not automatically redact TransportInfo objects.
...
Currently, NetworkCapabilities always redacts the TransportInfo
objects it contains whenever a defensive copy is made. This makes
it impossible to make a defensive copy on a TransportInfo
parcelled from another process without redacting it.
Stop redacting by default; instead rely on ConnectivityService
explicitly calling NetworkCapabilities' redacting constructor
when it returns a NetworkCapabilities object to an app via a
callback or synchronous call. This is currently done by
- createWithLocationInfoSanitizedIfNecessaryWhenParceled, which
is called from callCallbackForRequest, getNetworkCapabilities,
and getDefaultNetworkCapabilitiesForUser.
- getNetworkCapabilitiesWithoutUids, which is used when sending
ConnectivityDiagnosticsManager callbacks. In this method,
unconditionally redact all information, which is what the code
did previously due to the default redaction setting for empty
NetworkCapabilities objects being REDACT_ALL.
Bug: 183938194
Test: atest NetworkCapabilitiesTest
Test: atest FrameworksNetTests CtsNetTestCases HostsideVpnTests
Change-Id: I3108ee94cb0930958e071ba678c3554525b0db82
2021-05-13 20:24:19 +09:00
paulhu
96a65940d8
Update mobile data preference getter/setter
...
To satisfy OEM's requests, setting mobile data preference
should be by uid. Thus, update the getter/setter to
return/accept set of uids that need to apply mobile data
preference.
Bug: 171872461
Test: atest FrameworksNetTests
Change-Id: Id44efd2a6d820867f4405426c91e65b9ef155898
2021-05-13 10:35:29 +00:00
Remi NGUYEN VAN
2f51ae273b
Merge "Move net unit tests to packages/Connectivity" into sc-dev
2021-05-13 09:09:35 +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
8ad8668755
Merge "Add RESTRICTED_ALLOWED_APPS setting" am: 26cc1ff94e am: 93cbfdb5ff am: b8df949555
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689208
Change-Id: I59c9ff9a64eac6b3367169450ca2c063ef34ff3c
2021-05-13 06:36:18 +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
Remi NGUYEN VAN
65b8995a15
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
Ignore-AOSP-First: needs per-branch move for merge conflicts
Change-Id: I254ffd1c08ec058d594b4ea55cbae5505f8497cc
2021-05-13 05:55:44 +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
64e0c100b1
Merge "Add testVpnTypesEqual to verify consistency" am: edeab9051e am: f16388a8f5 am: 544e7294c1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705385
Change-Id: I53d58c5b2277ba2d88a848ed3e6d6269b4b886b3
2021-05-13 03:00:17 +00:00
Ken Chen
54fefcff7d
Merge "Better log in createNativeNetwork" am: 37dec89b65 am: 4728eb0924 am: 31aef231ab
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704925
Change-Id: I963967771fff102b25ce102c56789904d5e3c342
2021-05-13 02:59:56 +00:00
Ken Chen
bbe7ca9eb3
Merge "Switch from networkCreate[Physical/Vpn] to networkCreate" am: a0b65e1870 am: aa243fe3ba am: 05f062fb64
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669648
Change-Id: I3475e674c3914c4c61fd0a4246c9ee3e7e02c4fb
2021-05-13 02:59:30 +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
Lorenzo Colitti
a8dbcb7e4c
Merge changes from topic "transportinfo-explicit-redaction" into sc-dev
...
* changes:
Immediately redact VcnTransportInfo.
Do not automatically redact TransportInfo objects.
2021-05-12 22:46:36 +00:00
Lucas Lin
8b8f1c4e32
[automerger skipped] Merge "Update PrivateDnsMode from StringDef to IntDef" am: 0604a2e93e am: 735250d758 am: c3ab7b66d3 -s ours
...
am skip reason: Merged-In I23e7ec140066979726d769cabc5f7057bb2167e6 with SHA-1 3077988ad2 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675562
Change-Id: I6bf6c1259a83fb9763b286941b7df8fe6e491bcf
2021-05-12 18:24:14 +00:00
Lucas Lin
b8aeb4dde6
[automerger skipped] Merge "Remove sendNetworkConditionsBroadcast" into rvc-dev am: 542d796a9f am: 36fa4a55b4 -s ours am: 8ca73028d2 -s ours
...
am skip reason: Merged-In I7b43940dc32826c70fa82f471b35bc5cb8394aad with SHA-1 266d39b4cb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14455604
Change-Id: Ie39cad37ac044cb34c4cf46348904260c31ac3c2
2021-05-12 18:23:37 +00:00
Lucas Lin
de2e8bb778
[automerger skipped] Merge "Remove sendNetworkConditionsBroadcast" into rvc-dev am: 542d796a9f -s ours am: b173efe01a -s ours
...
am skip reason: Merged-In I7b43940dc32826c70fa82f471b35bc5cb8394aad with SHA-1 792f554dc9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14455604
Change-Id: I67136183ff603f3a8028dbc538dc2176dc650ce7
2021-05-12 17:59:59 +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
b173efe01a
[automerger skipped] Merge "Remove sendNetworkConditionsBroadcast" into rvc-dev am: 542d796a9f -s ours
...
am skip reason: Merged-In I7b43940dc32826c70fa82f471b35bc5cb8394aad with SHA-1 792f554dc9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14455604
Change-Id: I977a5bdbf0c320a83075a17208abb68aab52ff2d
2021-05-12 17:22:58 +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
35d3ca1c6d
Merge "Allow any transport with TEST if the network is restricted" am: 03de4e884b am: e32987bcb9 am: 6e2a3affcc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702489
Change-Id: Ib8ee3109ba5525ce1b1c6c2bd5ebcdc0b48a5319
2021-05-12 14:44:30 +00:00
Remi NGUYEN VAN
feb53db5e2
[automerger skipped] Merge "Use jniThrowErrnoException from JNIHelp" am: 60ce73bdc5 am: cb58eb4732 am: 126dfaf776 -s ours
...
am skip reason: Merged-In I257a9d55ce1f5a7c588e209b4a89d3e7a3e09994 with SHA-1 eb0e59193e is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703087
Change-Id: Ib3373d0634ceca77672cace31349edb4594fc46e
2021-05-12 14:43:22 +00:00
Remi NGUYEN VAN
4a6ce2b3a4
[automerger skipped] Merge "Move NetworkUtils JNI out of core/jni" am: 8842198f2e am: ba0f6837cc am: 169d66303b -s ours
...
am skip reason: Merged-In I0b55dfe92f3cb6e848d79ac7953756f39aaa2597 with SHA-1 8f0031d7aa is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703086
Change-Id: I3724d722bc66d3c54fe1c8cebacc65c3c097e5f8
2021-05-12 14:42:55 +00:00
Remi NGUYEN VAN
14032086f6
[automerger skipped] Merge "Build framework-connectivity using module_current" am: 40d3b1fbea am: 6e64634da0 am: 32df5aa7bb -s ours
...
am skip reason: Merged-In I2d51d37d067bf6fe86e4dedf05855a2dd67ed57c with SHA-1 2a311db05b is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703085
Change-Id: I4cf3780210515b5849832055c88dd189d7d61177
2021-05-12 14:42:03 +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