Remi NGUYEN VAN
e1cdb63453
Merge "Add public alternative for protectFromVpn" am: a68e748601 am: c9ba0260a3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605094
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I95739021d8f70ce1d5371b21ab4357061082bf16
2021-02-26 04:16:21 +00:00
Remi NGUYEN VAN
c9ba0260a3
Merge "Add public alternative for protectFromVpn" am: a68e748601
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605094
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I759af534bdf50f647351056275857c056998bf14
2021-02-26 03:22:03 +00:00
Remi NGUYEN VAN
a68e748601
Merge "Add public alternative for protectFromVpn"
2021-02-26 01:50:32 +00:00
Chris Weir
82ba0376e5
Merge "Update tests for PANS network usage metrics" am: e6b895b488 am: df390e2e8b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578824
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic312169c70b34bb8a834efae5ebb6b1a6cbb0296
2021-02-25 22:27:54 +00:00
Chris Weir
df390e2e8b
Merge "Update tests for PANS network usage metrics" am: e6b895b488
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578824
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8ac8031b7e405226a1b055be3c80eb902d48338b
2021-02-25 21:52:40 +00:00
Chris Weir
e6b895b488
Merge "Update tests for PANS network usage metrics"
2021-02-25 21:37:42 +00:00
Paul Hu
340a4b0dc5
Merge "Use alternative PhoneStateListener formal API" am: 4de7d07302 am: 6f12370cfc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554994
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2071765aba00d8520d3715831d267bcd35795d43
2021-02-25 13:38:42 +00:00
Paul Hu
6f12370cfc
Merge "Use alternative PhoneStateListener formal API" am: 4de7d07302
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554994
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I221f70b66e229c7209111227c40a0f4c0e616d85
2021-02-25 13:04:23 +00:00
Junyu Lai
d71c292044
Merge "[VCN07] Bypass VCN for non-internet app accessible cellular services" am: ef906819f9 am: b25df9f6c7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597954
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If935ced9f977749e1ce4d86fe74d186f5efcd896
2021-02-25 12:48:07 +00:00
Paul Hu
4de7d07302
Merge "Use alternative PhoneStateListener formal API"
2021-02-25 12:14:53 +00:00
Junyu Lai
b25df9f6c7
Merge "[VCN07] Bypass VCN for non-internet app accessible cellular services" am: ef906819f9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597954
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ied1e0628645c1320cf306fe508820cb80d03373a
2021-02-25 11:03:33 +00:00
Junyu Lai
ef906819f9
Merge "[VCN07] Bypass VCN for non-internet app accessible cellular services"
2021-02-25 10:16:03 +00:00
Lucas Lin
62751fc9cd
Merge "Replace BaseNetworkObserver with BaseNetdUnsolicitedEventListener" am: 692b07f7dd am: 076ce5f262
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547454
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4039814ea4c48bdaf7e54dbf3d1242a18235ee7b
2021-02-25 08:19:52 +00:00
Lucas Lin
076ce5f262
Merge "Replace BaseNetworkObserver with BaseNetdUnsolicitedEventListener" am: 692b07f7dd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547454
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idd7f8fe597639f334e5d99c23ab570a751f8d9d6
2021-02-25 07:44:24 +00:00
Lucas Lin
692b07f7dd
Merge "Replace BaseNetworkObserver with BaseNetdUnsolicitedEventListener"
2021-02-25 06:45:15 +00:00
James Mattis
b98cbf8c82
Merge "Unit test automation for Multi-Default Tracking" am: 8b3ccda6bb am: 2660c17a1d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579207
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0a26e63926019c37b639f59d5cd7ad901902e2b7
2021-02-24 16:54:32 +00:00
James Mattis
2660c17a1d
Merge "Unit test automation for Multi-Default Tracking" am: 8b3ccda6bb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579207
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I610c8356f00cbd983bcb155139db06d2e16d0748
2021-02-24 15:57:46 +00:00
Chris Weir
b692cc8e5c
Update tests for PANS network usage metrics
...
Update existing tests to use new NetworkTemplate/NetworkIdentity
constructors, and add additional tests for new PANS metrics features.
Bug: 175793874
Bug: 174485293
Test: Run the tests in this CL with atest
Change-Id: I6f50993397d886a266874da0047c02022a69f62e
2021-02-23 22:16:19 -08:00
Remi NGUYEN VAN
caaa4df54c
Add public alternative for protectFromVpn
...
The method is called directly by VpnService#protect.
Bug: 171540887
Test: m
Change-Id: I7cbb1ef1301dcf8d27b2cc39c0431a0156fe3442
2021-02-24 14:49:35 +09:00
James Mattis
6177885a1a
Unit test automation for Multi-Default Tracking
...
Unit test automation validating how multiple default networks are
tracked within ConnectivityService when set by network preferences
used with setOemNetworkPreference() API functionality.
Bug: 178632672
Bug: 172347841
Bug: 170068946
Test: atest FrameworksNetTests
Change-Id: Iae1935944214efaa8a21636c55e6d8be816275f7
2021-02-23 19:03:34 -08:00
Chiachang Wang
d1e6da0852
Merge "Remove UidRange.createForUser() with userId integers" am: a611e12599 am: 06efdc49f3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596511
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I53fdc5ad0cb8f6859c025a11b08ea7f77fb45442
2021-02-24 01:24:02 +00:00
Paul Hu
962783b165
Merge "Use PermissionUtils" am: fb2b8378b8 am: 6e80ff426f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559098
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I483e0db6e9aac5d8ca8d4aa6912fa6f66b198e87
2021-02-24 01:23:09 +00:00
Chiachang Wang
06efdc49f3
Merge "Remove UidRange.createForUser() with userId integers" am: a611e12599
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596511
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I736f502788487fd8c0d3f6037866c17945831d62
2021-02-24 00:46:03 +00:00
Chiachang Wang
f3dec042fa
Merge "Move shared methods to net shared lib" am: 36c58380fe am: 0367f91058
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571901
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I09beedc0e71685bba4fa6dc5cc80907ec923b684
2021-02-24 00:39:42 +00:00
Paul Hu
6e80ff426f
Merge "Use PermissionUtils" am: fb2b8378b8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559098
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I81a3b8d23d1d708675206b36367326c44113c46d
2021-02-24 00:29:54 +00:00
Chiachang Wang
0367f91058
Merge "Move shared methods to net shared lib" am: 36c58380fe
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571901
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3baac3770814ea1aba213e54430c44308b0c07bc
2021-02-24 00:16:42 +00:00
Treehugger Robot
d9dc2f3a51
Merge "Clean up T&C implementation" am: 27f44dc792 am: 23cce86e06
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1583505
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3be4ea39f03e9d9c8a398acba2269a0d7c3feb68
2021-02-23 23:58:18 +00:00
Treehugger Robot
23cce86e06
Merge "Clean up T&C implementation" am: 27f44dc792
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1583505
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I28c5722b7d9e4089be8f42149c3a0407ea3500a7
2021-02-23 23:49:21 +00:00
Lucas Lin
58f8da548d
Merge changes I852e3a53,I86755647,I0ed8b0c6 am: 0f35b07653 am: 9af180ede6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553736
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic520c715578c8c5dd70040bbdc4c535330b0a453
2021-02-23 22:46:54 +00:00
Treehugger Robot
d06fbbb6f5
Merge "Revert "Revert "Delete VPN methods in ConnectivityManager.""" am: 25e1524c60 am: e14979682a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597635
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id640d18f07531b74582bef6725453c8de8176fe7
2021-02-23 22:30:23 +00:00
Paul Hu
e137456173
Merge "Stop using SysetmConfig#getSystemPermissions on PermissionMonitor" am: 3172402dff am: 29c0ce536f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545848
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2dae2969457d18b23f21cb1b47480f756e460a43
2021-02-23 22:29:30 +00:00
Paul Hu
4486398e91
Merge "Remove ArrayUtils usage in connectivity classes" am: 68614b554e am: 2cc02fbe38
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513051
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I81598d1711afbb2342c5da42a992a32252d990fa
2021-02-23 22:29:16 +00:00
Lucas Lin
9af180ede6
Merge changes I852e3a53,I86755647,I0ed8b0c6 am: 0f35b07653
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553736
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0428b441b34d48157a28dfc0463976be135146f4
2021-02-23 22:27:15 +00:00
Treehugger Robot
e14979682a
Merge "Revert "Revert "Delete VPN methods in ConnectivityManager.""" am: 25e1524c60
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597635
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie9256f3912623619be712b82810f4086c6773bba
2021-02-23 22:24:15 +00:00
Paul Hu
29c0ce536f
Merge "Stop using SysetmConfig#getSystemPermissions on PermissionMonitor" am: 3172402dff
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545848
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia4697e282fbc46044d1a1f477568ef9ccb02d221
2021-02-23 22:15:51 +00:00
Paul Hu
2cc02fbe38
Merge "Remove ArrayUtils usage in connectivity classes" am: 68614b554e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513051
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2c7b2314ea6d6a8b234836ab4d47319daf8cd642
2021-02-23 22:11:19 +00:00
Xin Li
3a388bf8a4
[automerger skipped] Merge ab/7061308 into stage. am: e8cbbd6b6c -s ours
...
am skip reason: Change-Id I4bf82035631ccff6d5a6144d6d9b1d203b076851 with SHA-1 3078660c4e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13657544
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie387abaa6af0c76ebd6801707d21443ebbda5c93
2021-02-23 09:05:19 +00:00
Chiachang Wang
a611e12599
Merge "Remove UidRange.createForUser() with userId integers"
2021-02-23 07:17:07 +00:00
Paul Hu
fb2b8378b8
Merge "Use PermissionUtils"
2021-02-23 01:48:58 +00:00
Chiachang Wang
36c58380fe
Merge "Move shared methods to net shared lib"
2021-02-23 00:58:59 +00:00
Treehugger Robot
27f44dc792
Merge "Clean up T&C implementation"
2021-02-22 19:58:43 +00:00
lucaslin
db201dac1d
Replace BaseNetworkObserver with BaseNetdUnsolicitedEventListener
...
ConnectivityService will be a part of mainline module, to prevent
using @hide API of NetworkManagementService in TestNetworkService,
use function inside NetdUtils instead.
Bug: 170598012
Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Change-Id: Id615f7b900d26d0f5887adcd8221dc8bef239923
2021-02-23 01:12:55 +08:00
Chiachang Wang
c94d3238a3
Remove UidRange.createForUser() with userId integers
...
UidRange will be a part of connectivity mainline module.
Mainline modules should use strongly-typed UserHandle arguments.
The method also refer to the hidden UserHandle.PER_USER_RANGE
which is not available after UidRange is moved into module.
Thus, replace the usage and remove the createForUser method that
takes userId parameter.
Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: I3f33ea92c4a24342af9ec4b0367c50bb64ce6450
2021-02-22 18:51:14 +08:00
Lucas Lin
0f35b07653
Merge changes I852e3a53,I86755647,I0ed8b0c6
...
* changes:
Remove unused INetworkManagementService from IpSecService
Use NetdUtils instead of NetworkManagementService in Vpn
Use NetdUtils instead of NetworkManagementService in IpSecService
2021-02-22 06:49:39 +00:00
paulhu
ec4738e48f
Use alternative PhoneStateListener formal API
...
MultinetworkPolicyTracker is part of Connectivity mainline module
which cannot call @hide API to register PhoneStateListener. Thus,
replace it to formal API.
Bug: 171183530
Test: atest FrameworksNetTests
Change-Id: Ib02790623e82726aaada33f559226020d1e0019b
2021-02-22 14:31:58 +08:00
Treehugger Robot
25e1524c60
Merge "Revert "Revert "Delete VPN methods in ConnectivityManager."""
2021-02-22 06:12:48 +00:00
Paul Hu
3172402dff
Merge "Stop using SysetmConfig#getSystemPermissions on PermissionMonitor"
2021-02-22 05:22:37 +00:00
Paul Hu
68614b554e
Merge "Remove ArrayUtils usage in connectivity classes"
2021-02-22 05:22:01 +00:00
Lorenzo Colitti
684d3471eb
Revert "Revert "Delete VPN methods in ConnectivityManager.""
...
1. Stop using ConnectivityManager for VPNs in VpnDialogs.
2. Delete updateLockdownVpn, since all callers have been migrated
to calling VpnManager directly.
3. Delete the call to VpnManager in factoryReset, since the only
caller (ResetNetworkConfirm) has been updated to call into
VpnManager directly.
4. Delete getVpnManager, since it is now unused.
This reverts commit 66ef4728a1 .
Reason for revert: should be safe to submit now that aosp/1596096 is merged
Bug: 173331190
Test: treehugger
Change-Id: Ife3607c024006ce4fe46c981e9742170becb6331
2021-02-22 05:07:22 +00:00
junyulai
71d157f0e2
[VCN07] Bypass VCN for non-internet app accessible cellular services
...
Deduce the NET_CAPABILITY_NOT_VCN_MANAGED capability from other
capabilities and user intention, which includes:
1. For the requests that don't have anything besides
VCN_SUPPORTED_CAPABILITIES, add the NOT_VCN_MANAGED to
allow the callers automatically utilize VCN networks
if available.
2. For the requests that explicitly add or remove
NOT_VCN_MANAGED, do not alter them to allow user fire
request that suits their need.
Test: atest NetworkRequestTest#testBypassingVcnForNonInternetRequest
Bug: 175662146
Change-Id: I2876264cee14b624c89ba3b380027a8b521ad8ea
(cherry-picked from aosp/1549817)
2021-02-22 10:19:16 +08:00