Merge "Add a test for starting the legacy VPN." am: c029c1e928 am: 0cc2c0d906 am: 48ac26604f am: e2bfd0071b am: f2fff2dd40
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1372896
Change-Id: I96f4bbb9b109e3e5813d083bed1989d88fb156b8
Chalard Jean
authored and
Automerger Merge Worker
commited 2020-08-06 17:11:25 +00:00
ebd815af23
Merge "Add a test for starting the legacy VPN." am: c029c1e928 am: 0cc2c0d906
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1372896
Change-Id: Idc49c61cc0547cdabe37cfa19b685c2beeda473b
Chalard Jean
authored and
Automerger Merge Worker
commited 2020-08-06 16:06:08 +00:00
48ac26604f
Merge "Add a test for starting the legacy VPN."
Chalard Jean
authored and
Gerrit Code Review
commited 2020-08-06 12:50:50 +00:00
c029c1e928
Add a test for starting the legacy VPN.
...
The legacy VPN has, among many parameters, a host to connect to.
This host can be specified as a numeric address, or as a hostname.
When it's a name, resolution is required. Currently, name
resolution is performed by the native VPN daemons racoon and
mtpd. When a hostname is used, the framework does not know the
IP address of the VPN server and does not add a throw route for
the VPN server IP address. On older kernels this does not matter
because the legacy PPP kernel code binds the PPP socket to the
right network, but on newer devices that use the upstream PPP
code, this does not work. See b/133797637.
This patch instruments the legacy VPN code so that it can be
run in tests, and uses this instrumentation to simulate passing
a configuration that contains a host, and verifies that the
arguments passed to the mptd and racoon daemons receive the
expected server address, and that the expected throw route is
correctly installed.
It then adds two tests : one specifying the server as a numeric
address, and one as a hostname. As the resolution is currently
broken, the latter of these tests is added disabled, and the
followup fix to the issue enables it.
This test is basic and very targeted, but it's what we need right
now. Also there are plans to remove this entire code path in S, so
the test being ad-hoc is not much of a problem.
Test: this
Bug: 158974172
Change-Id: I420b63db03a58e8c67a98a85c9f4c2d6ed7ad078
(cherry picked from commit 45846a03051a13d667732288e457eab4336a691e)
Chalard Jean
commited 2020-08-06 17:16:00 +09:00
ceacf96547
Merge "[RFPM04] Adjust hasRestrictedNetworkPermission method" am: cb4e4712b8 am: 296741de68 am: 715a48b386 am: 0f9b51cb06 am: 8ac1f7d5de
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1321322
Change-Id: I6b0e7531effbb8c627697b3d7c475de3394b7f52
Paul Hu
authored and
Automerger Merge Worker
commited 2020-08-03 12:20:18 +00:00
067f1a64a9
Merge "[RFPM04] Adjust hasRestrictedNetworkPermission method" am: cb4e4712b8 am: 296741de68
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1321322
Change-Id: Id91c6de75e524080d15e2508007d5de997c7fd92
Paul Hu
authored and
Automerger Merge Worker
commited 2020-08-03 11:18:31 +00:00
715a48b386
Merge "[RFPM04] Adjust hasRestrictedNetworkPermission method"
Paul Hu
authored and
Gerrit Code Review
commited 2020-08-03 10:37:52 +00:00
cb4e4712b8
Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission"
Peter Wang
authored and
Gerrit Code Review
commited 2020-07-31 08:43:44 +00:00
617ea90340
Merge "Move utils from network stack to libs." am: 21be4fabb5 am: d065a0a4e6 am: 642beae1fd am: 475d83afd8 am: af3cafb891
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350083
Change-Id: I55c36bb60ea81f86daa193e9dff738846984e1e7
Chalard Jean
authored and
Automerger Merge Worker
commited 2020-07-31 01:34:46 +00:00
2090fe9e2a
Merge "Move utils from network stack to libs." am: 21be4fabb5 am: d065a0a4e6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350083
Change-Id: Ia163bc416e16ce56fc96855c1111a9905b712843
Chalard Jean
authored and
Automerger Merge Worker
commited 2020-07-31 01:09:46 +00:00
642beae1fd
Move utils from network stack to libs.
...
This package is using some common utilities from
a library that used to live in the network stack.
A better home for these utilities is frameworks/libs,
so this topic moves the files ther and also changes
the package of some utilities.
See aosp/1350222 and aosp/1350182 for a detailed
description of the specific files that moved.
Test: checkbuild
Change-Id: I76a9b7790f3997e3e6b3c2f75ba6308286457cde
Chalard Jean
commited 2020-07-29 21:15:48 +09:00
2156153db4
Merge "[RFPM03] Check permission by uid." am: 629f681106 am: 31dd6c3fd7 am: d091e8ff6e am: 405271b652 am: 5280e52f78
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1320375
Change-Id: Iee10248986fe1bda9fa97e6ae387e5ca4ec557c6
Paul Hu
authored and
Automerger Merge Worker
commited 2020-07-29 06:46:16 +00:00
35c33c109b
[RFPM04] Adjust hasRestrictedNetworkPermission method
...
There are two parts in hasRestrictedNetworkPermission method.
One is carryover package check and one is uid permission
check. Seperate carryover package check part to another method
to be clearer the usage of hasRestrictedNetworkPermission method.
Bug: 132784544
Test: atest FrameworksNetTests
Change-Id: Iab0609fcaa52acb0dfcb31ca957f22bfe8d62392
paulhu
commited 2020-07-29 14:14:27 +08:00
bfa9f182b0
Merge "[RFPM03] Check permission by uid." am: 629f681106 am: 31dd6c3fd7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1320375
Change-Id: I80406643e4797b1e269b4f7c5711339371fa533b
Paul Hu
authored and
Automerger Merge Worker
commited 2020-07-29 05:53:25 +00:00
d091e8ff6e
Merge "[RFPM03] Check permission by uid."
Paul Hu
authored and
Gerrit Code Review
commited 2020-07-29 05:41:32 +00:00
629f681106
Merge "Gracefully handle integer overflows." am: 71fdf4ab8d am: 10c70fd2dd am: 42a12b57f2 am: 811fee2a2a am: 2f5d9400f5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1316217
Change-Id: I7c04b66f75f64c214bd0c8d27bb5dbeda13094ce
Junyu Lai
authored and
Automerger Merge Worker
commited 2020-07-29 02:58:33 +00:00
0806839c8c
Merge "Gracefully handle integer overflows." am: 71fdf4ab8d am: 10c70fd2dd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1316217
Change-Id: I0bba17d0367ebf4e1c868a8cc7471366bc7a4408
Junyu Lai
authored and
Automerger Merge Worker
commited 2020-07-29 01:55:23 +00:00
42a12b57f2
Merge "Gracefully handle integer overflows."
Junyu Lai
authored and
Gerrit Code Review
commited 2020-07-29 01:19:07 +00:00
71fdf4ab8d
Merge "Update language to comply with Android's inclusive language guidance" am: 7c1142d4ad am: 261dd20290 am: f61e400585 am: 0b63167552 am: 1411f69053
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373160
Change-Id: Ideecaaaa12e82c5771e75d0c743228f6478e1ca3
Chiachang Wang
authored and
Automerger Merge Worker
commited 2020-07-28 12:03:04 +00:00
d3bd1a5cf2
Merge "Update language to comply with Android's inclusive language guidance" am: 7c1142d4ad am: 261dd20290
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373160
Change-Id: I9318abb0233e7b8847466914724eeaae769ea9c8
Chiachang Wang
authored and
Automerger Merge Worker
commited 2020-07-28 11:19:47 +00:00
f61e400585
Merge "Update language to comply with Android's inclusive language guidance"
Chiachang Wang
authored and
Gerrit Code Review
commited 2020-07-28 10:51:53 +00:00
7c1142d4ad
[RFPM03] Check permission by uid.
...
PermissionMonitor check permission by each package name but only
update the uid permission to netd. It's better to check
permission by uid directly. Thus, use
ActivityManager#checkUidPermission to check permissions for each
uid.
Bug: 132784544
Test: atest FrameworksNetTests
Change-Id: I057d34383b4dc408b2773e4c6b146774ba0c5eb2
paulhu
commited 2020-07-28 18:23:38 +08:00
f1e343c1c3
Update language to comply with Android's inclusive language guidance
...
See https://source.android.com/setup/contribute/respectful-code
for reference.
Bug: 161896447
Test: m
Change-Id: I6c3c03c0c2d1302af6d5245486823c13a3432900
Chiachang Wang
commited 2020-07-28 15:36:30 +08:00
7d5f378d5b
Gracefully handle integer overflows.
...
Avoid recording negative data by doing integer-based
math as much as possible, but switch to double-based
math if we detect that we'd end up causing an overflow.
Test :
- Builds, Boots
- High data throughput scenarios
- NetworkStatsHistoryTest, NetworkStatsCollectionTest,
NetworkStatsTest
Bug: 119527458
Change-Id: I55d4aa649bea3ae201ad513074ff2b71cb918dad
Pavan Kumar M
commited 2020-07-28 11:36:49 +05:30
0653b60fa6
Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode" am: 1429504583 am: 01b83e0493
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364497
Change-Id: Idef0dd6e0e0486b76c0067540e580d444e97d6a0
Treehugger Robot
authored and
Automerger Merge Worker
commited 2020-07-16 12:09:04 +00:00
01f048c36d
Attribute data usage to virtual RAT type for 5G non-standalone mode
...
Test: atest NetworkStatsSubscriptionsMonitorTest#test5g
Bug: 160727498
Change-Id: I8753e68140c0993773017c9a49bd8a666a364071
Merged-In: I8753e68140c0993773017c9a49bd8a666a364071
(cherry-picked from ag/12167624)
junyulai
commited 2020-07-16 18:22:09 +08:00
384ee54683
[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and
...
guard with permission
Bug: 150878235
Fix: 150878235
Test: Build
Change-Id: I7f3b1f5170e032336d9b39b322c49e2b92573586
Merged-In: I7f3b1f5170e032336d9b39b322c49e2b92573586
Peter Wang
commited 2020-07-16 02:01:06 -07:00
a25a11cdd2
Attribute data usage to virtual RAT type for 5G non-standalone mode
...
Test: atest NetworkStatsSubscriptionsMonitorTest#test5g
Bug: 160727498
Change-Id: I8753e68140c0993773017c9a49bd8a666a364071
junyulai
commited 2020-07-16 15:32:01 +08:00
fef7a257be
Merge "Revert "Attribute data usage to 5G for 5G non-standalone mode"" am: 13c5ee8313 am: f9c09d213c am: 867430ae1d am: 4232af7e40 am: 41029e25ce
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360157
Change-Id: I6dfb1ec8e41adf39dce5361389e471e83425bc4e
Treehugger Robot
authored and
Automerger Merge Worker
commited 2020-07-10 06:17:03 +00:00
2e5f2ae310
Merge "Revert "Attribute data usage to 5G for 5G non-standalone mode"" am: 13c5ee8313 am: f9c09d213c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360157
Change-Id: If052329128326fba72ff27c024a2c6652b7bb1ef
Treehugger Robot
authored and
Automerger Merge Worker
commited 2020-07-10 05:41:05 +00:00
867430ae1d
Merge "Attribute data usage to 5G for 5G non-standalone mode" am: c987a53a93 am: a1301d5850 am: 69b27184a7 am: 0527bf55f9 am: 90b89ee298
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359203
Change-Id: Ifde023200e39995411932a44716a3eeb6daea542
Junyu Lai
authored and
Automerger Merge Worker
commited 2020-07-10 03:45:23 +00:00
d62ff0ac25
Revert "Attribute data usage to 5G for 5G non-standalone mode"
...
This reverts commit b04880e7ca .
Reason for revert: Revert and wait for the design is settled down.
Change-Id: I10fdfc37d6456678de1886698cd6ad08bf8aa810
Junyu Lai
commited 2020-07-10 03:43:19 +00:00
b20ac232a3
Merge "Attribute data usage to 5G for 5G non-standalone mode" am: c987a53a93 am: a1301d5850
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359203
Change-Id: I860b0226157ee31f0488d6b2252ae157e86dc5eb
Junyu Lai
authored and
Automerger Merge Worker
commited 2020-07-10 03:10:15 +00:00
69b27184a7
Attribute data usage to 5G for 5G non-standalone mode
...
Test: atest NetworkStatsSubscriptionsMonitorTest#test5g
Bug: 160727498
Change-Id: I563df14500caeb3602b381479afaf5163ad8e6a1
junyulai
commited 2020-07-09 16:56:54 +08:00
b04880e7ca
Merge "[RFPM02] Add Dependencies class for injection in tests." am: 0cb16d1bb3 am: 7ce1646c8f am: 6f659fab51 am: 5ae4c18d16 am: cdddbb9536
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318291
Change-Id: I487c0a86d7b572b568c0b91b20624b234668e164
Paul Hu
authored and
Automerger Merge Worker
commited 2020-07-08 11:15:40 +00:00
4dfa5c3f58
Merge "[RFPM02] Add Dependencies class for injection in tests." am: 0cb16d1bb3 am: 7ce1646c8f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318291
Change-Id: If53e1521327c8d9f1fd2a5debb94c58ed25b2880
Paul Hu
authored and
Automerger Merge Worker
commited 2020-07-08 10:35:21 +00:00
6f659fab51
[RFPM02] Add Dependencies class for injection in tests.
...
Add Dependencies class in PermissionMonitor for injection
in tests easily.
Bug: 132784544
Test: atests FrameworksNetTests
Change-Id: Ibb84d548908f7a955fa0ff206794486733259978
paulhu
commited 2020-07-08 15:30:42 +08:00
9883de0b7f
Merge "Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttrib..."" am: 2345894c5a am: 36824bfbd5 am: 3ace30afac am: e28bee0bc3 am: ba0530faa4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353491
Change-Id: Ifd265eda7e5cd9c9d66cd19394bdb3c881dc5d16
Chalard Jean
authored and
Automerger Merge Worker
commited 2020-07-01 06:08:18 +00:00
407167ae13
Merge "Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttrib..."" am: 2345894c5a am: 36824bfbd5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353491
Change-Id: Ibc8d633a6e04f7cd0f4c1a0d02ae586232cc0c6a
Chalard Jean
authored and
Automerger Merge Worker
commited 2020-07-01 05:33:41 +00:00
3ace30afac
Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttrib..."
...
Revert "Add new network quirk parcelable in the NetworkAttributes."
Revert submission 1323251-ipv6_prov_loss_quirk_parcelable
Reason for revert: Breaks CtsStrictJavaPackagesTestCases
Reverted Changes:
I18e05c09f:Add new network quirk parcelable in the NetworkAtt...
I8dbff2377:Test IPv6ProvisioningLossParcelable in the Network...
Change-Id: Ie906919b344131cd768fbed787248d3caac2f74d
Chalard Jean
commited 2020-07-01 01:46:26 +00:00
24ed491f88
Merge "Test IPv6ProvisioningLossParcelable in the NetworkAttributes." am: 1f6c6479b9 am: 0df54895ad am: 400b2769fa am: 7eafd58b80 am: 9093db72d8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322637
Change-Id: I39c6ea15ae901c7ad6a90bee5caa6064ac09847b
Xiao Ma
authored and
Automerger Merge Worker
commited 2020-06-29 12:56:08 +00:00
bfac4769bc
Merge "[RFPM01] Merge package added/removed methods" am: fac73070cc am: 18da2dcce5 am: 3d1867013e am: 3a3bba00a6 am: 5e0c39fe2a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317236
Change-Id: I8b789c3cb90357a6d408565201d80a13fad92587
Paul Hu
authored and
Automerger Merge Worker
commited 2020-06-29 12:54:41 +00:00
f1cf6f4cf6
Merge "Test IPv6ProvisioningLossParcelable in the NetworkAttributes." am: 1f6c6479b9 am: 0df54895ad
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322637
Change-Id: Iaf964024c44e6b78ccb3b8fcf3fc131479747a81
Xiao Ma
authored and
Automerger Merge Worker
commited 2020-06-29 12:17:26 +00:00
400b2769fa
Merge "[RFPM01] Merge package added/removed methods" am: fac73070cc am: 18da2dcce5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317236
Change-Id: Ida8f82d2ec5be1040a2bdf2aa65a94d53f68ea6c
Paul Hu
authored and
Automerger Merge Worker
commited 2020-06-29 12:16:47 +00:00
3d1867013e
Test IPv6ProvisioningLossParcelable in the NetworkAttributes.
...
Bug: 157534516
Test: atest FrameworksNetTests
Change-Id: I8dbff2377457bb8fd0f447be0a3cda9af952f2a2
Xiao Ma
commited 2020-06-29 11:57:32 +00:00
c2e0dc084a
[RFPM01] Merge package added/removed methods
...
There are two methods to handle package added/removed from
two differnt listeners. It can use one of listener to handle the
changes. Thus, keep PackageManagerInternal#PackageListObserver
but remove the listening from ConnectivityService.
Bug: 132784544
Test: atests FrameworksNetTests
Change-Id: Ib2db85e4108f9fda731bf6667d0af0610fc79fea
paulhu
commited 2020-06-23 16:10:03 +08:00
e952ccfdf4
Merge "Update DnsManagerTest for AIDL interface change" into rvc-dev am: f6aeae7ca6 am: 4a5922b7e0 am: e6da8ac742 am: 23f9da3170
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11954238
Change-Id: I21129279b6ac94bebb55e0798e0da12ef5a0b5eb
TreeHugger Robot
authored and
Automerger Merge Worker
commited 2020-06-22 16:00:44 +00:00
8ea2167cfa
Merge "Update DnsManagerTest for AIDL interface change" into rvc-dev am: f6aeae7ca6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11954238
Change-Id: I1327794e6b8201d3c47c39838cfa516812cf273d
TreeHugger Robot
authored and
Automerger Merge Worker
commited 2020-06-22 15:18:45 +00:00
4a5922b7e0
Update DnsManagerTest for AIDL interface change
...
Check one more parameter enforceDnsUid in ResolverOptionsParcel in
DnsManagerTest.
Bug: 159587277
Test: atest
com.android.server.connectivity.DnsManagerTest#testSendDnsConfiguration
Change-Id: Ic53f42b968626294c851dac252a70769846ba427
Merged-In: Ic53f42b968626294c851dac252a70769846ba427
Ken Chen
authored and
Lorenzo Colitti
commited 2020-06-22 15:10:12 +00:00
a523111101
Merge "Update DnsManagerTest for AIDL interface change" into rvc-dev
TreeHugger Robot
authored and
Android (Google) Code Review
commited 2020-06-22 15:09:54 +00:00
f6aeae7ca6