Ken Chen
1ba322e461
Merge "Let ConnectivityService control the socket closure" am: 191e2d3c39 am: 968c4ed867 am: 9d2c783e91
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534909
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I159a4a4115f200e78bc368d9db2997c58d0858b8
2021-01-12 23:46:44 +00:00
Ken Chen
9d2c783e91
Merge "Let ConnectivityService control the socket closure" am: 191e2d3c39 am: 968c4ed867
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534909
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I792005c9abd7ccf6a0948330a32b2dcc07d51506
2021-01-12 23:03:49 +00:00
Ken Chen
968c4ed867
Merge "Let ConnectivityService control the socket closure" am: 191e2d3c39
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534909
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I867128ec2eddf494c8ff15e19c54733778d5eace
2021-01-12 22:39:07 +00:00
Ken Chen
b8e4bc9c3f
Let ConnectivityService control the socket closure
...
Netd currently calls maybeCloseSockets before adding/removing users for
network. The task should be moved from netd to CS. In this way, we can
handle WiFi lingering more easily in the future.
Test: atest HostsideVpnTests
Test: atest FrameworksNetTests
Change-Id: Icf8125e8552c89da367a67f48611ed193a1a343d
2021-01-12 23:50:28 +08:00
Lorenzo Colitti
183bdef769
Merge "Remove Vpn#isBlockingUid." am: 57f4dfc101 am: aeeac8d0c7 am: 19281cbdb4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528212
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I141c6e1d0585f81e2ab14ad96499beb112eebdb5
2021-01-12 11:26:08 +00:00
Paul Hu
4dbc0c0343
Merge "Replace NetworkPolicyManagerInternal#isUidNetworkingBlocked()" am: 016c1500f4 am: 1340c9e3d2 am: f2b3fdc064
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535722
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id78638ca2a5384accb7b1b92d70a779fda561b98
2021-01-12 11:25:28 +00:00
Lorenzo Colitti
19281cbdb4
Merge "Remove Vpn#isBlockingUid." am: 57f4dfc101 am: aeeac8d0c7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528212
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic509770103b1538cdb5a16e8ba0753029c0863b9
2021-01-12 11:12:11 +00:00
Paul Hu
f2b3fdc064
Merge "Replace NetworkPolicyManagerInternal#isUidNetworkingBlocked()" am: 016c1500f4 am: 1340c9e3d2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535722
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I623a01c29978908b213e888ffebc06f38d5ee085
2021-01-12 11:11:08 +00:00
Treehugger Robot
9240e320b9
Merge "[VCN02] Make LingerTimer takes request Id instead of NetworkRequest" am: 5e27a2f6e3 am: d6033084b2 am: 5303115994
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529109
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I99aa6ba209a6e051d9c2c9ebf9f2635effaa450b
2021-01-12 11:03:01 +00:00
Lorenzo Colitti
aeeac8d0c7
Merge "Remove Vpn#isBlockingUid." am: 57f4dfc101
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528212
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2c3745aaf5822a75e4597d7ff326680f9d7c63d7
2021-01-12 10:25:46 +00:00
Paul Hu
1340c9e3d2
Merge "Replace NetworkPolicyManagerInternal#isUidNetworkingBlocked()" am: 016c1500f4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535722
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id0936169def9a3ec1fe5895f948fc2a776a0deec
2021-01-12 10:22:27 +00:00
Lorenzo Colitti
57f4dfc101
Merge "Remove Vpn#isBlockingUid."
2021-01-12 10:20:33 +00:00
Treehugger Robot
5303115994
Merge "[VCN02] Make LingerTimer takes request Id instead of NetworkRequest" am: 5e27a2f6e3 am: d6033084b2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529109
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1388064603ed3df9719997522e53ffb7b4903b25
2021-01-12 10:05:35 +00:00
Paul Hu
016c1500f4
Merge "Replace NetworkPolicyManagerInternal#isUidNetworkingBlocked()"
2021-01-12 09:53:05 +00:00
Treehugger Robot
d6033084b2
Merge "[VCN02] Make LingerTimer takes request Id instead of NetworkRequest" am: 5e27a2f6e3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529109
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I01c9c7e2b8022f2fbec610934e43245cda3483be
2021-01-12 09:40:36 +00:00
Treehugger Robot
5e27a2f6e3
Merge "[VCN02] Make LingerTimer takes request Id instead of NetworkRequest"
2021-01-12 08:59:04 +00:00
Treehugger Robot
f2b8791703
Merge "Improve error message when testing network factory" am: 5c19af924e am: 00545d7629 am: d89648a6cc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531798
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4b421f7b2895a24912d37d73dc011fa440440cf2
2021-01-12 05:31:18 +00:00
Treehugger Robot
d89648a6cc
Merge "Improve error message when testing network factory" am: 5c19af924e am: 00545d7629
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531798
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1b867dec65d458d248706b4118f8d23055eea3a8
2021-01-12 05:13:18 +00:00
Treehugger Robot
00545d7629
Merge "Improve error message when testing network factory" am: 5c19af924e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531798
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I80d0f3bd9ef8c9da1d311b001d2c42a5d1652e08
2021-01-12 04:18:22 +00:00
Treehugger Robot
5c19af924e
Merge "Improve error message when testing network factory"
2021-01-12 03:50:30 +00:00
Remi NGUYEN VAN
00816cf5d9
Merge "Revert^2 "Move service-connectivity to the tethering APEX"" am: fd834aa031 am: 6508b373ee am: 4e0db1b874
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542626
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I81a7577b0cf474bbb53ca38ddd093ba4342ab543
2021-01-12 03:42:16 +00:00
paulhu
3b063e3640
Replace NetworkPolicyManagerInternal#isUidNetworkingBlocked()
...
Connectivity service is going to become a mainline module which
will not able to access hidden APIs. NetworkPolicyManagerInternal
is a internal serivce that CS can't be access after be a mainline
module. Thus, replace NPMI#isUidNetworkingBlocked() to similar
method NPMS#isUidNetworkingBlocked() and create new API
NPM#isUidNetworkingBlocked() to support CS usage.
Bug: 170598012
Test: atest FrameworksNetTests
Test: atest FrameworksCoreTests:NetworkPolicyManagerTest
Test: atest FrameworksServicesTests:NetworkPolicyManagerServiceTest
Test: atest CtsNetTestCases
Test: atest CtsHostsideNetworkTests
Change-Id: Ic3427c71c395de787320f303c9513874b4d64f98
2021-01-12 10:53:05 +08:00
Remi NGUYEN VAN
4e0db1b874
Merge "Revert^2 "Move service-connectivity to the tethering APEX"" am: fd834aa031 am: 6508b373ee
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542626
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0b44d8e25e3f0a4d596cef2befea52c2606c9a58
2021-01-12 02:21:57 +00:00
Remi NGUYEN VAN
6508b373ee
Merge "Revert^2 "Move service-connectivity to the tethering APEX"" am: fd834aa031
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542626
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5dc50e0510e1716db733fec6fa56adfe91ac4cc0
2021-01-12 02:05:59 +00:00
Remi NGUYEN VAN
fd834aa031
Merge "Revert^2 "Move service-connectivity to the tethering APEX""
2021-01-12 01:35:30 +00:00
Jeff DeCew
2c92a7415a
Merge "Show LargeIcon as wide for apps targeting S."
2021-01-08 20:57:53 +00:00
Junyu Lai
611f6e7819
Merge "Revert "wifi: Add systemAPi:setSubscriberId in NetworkAgentConfig"" am: f44c7cc998 am: 7acae7b049 am: c575215274
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542628
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib7ca2c9482b3d4c6e50975825239ca9bc461991b
2021-01-08 15:15:51 +00:00
Junyu Lai
c575215274
Merge "Revert "wifi: Add systemAPi:setSubscriberId in NetworkAgentConfig"" am: f44c7cc998 am: 7acae7b049
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542628
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I66fba706c6a8f78344026eac490ad266f838c21f
2021-01-08 14:52:54 +00:00
Junyu Lai
7acae7b049
Merge "Revert "wifi: Add systemAPi:setSubscriberId in NetworkAgentConfig"" am: f44c7cc998
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542628
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie7b3dbf38a38a0ac0b1cfa86822a5eb3318b0990
2021-01-08 14:29:39 +00:00
Treehugger Robot
19efed5fab
Merge "Pivot network statistics to use DataInput/Output." am: 14b8536eb3 am: 67ae1d500b am: 2ac863a446
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540224
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I44be7ea64d012f35d312ae3b039b0fd7e37e9d60
2021-01-08 11:49:37 +00:00
Treehugger Robot
2ac863a446
Merge "Pivot network statistics to use DataInput/Output." am: 14b8536eb3 am: 67ae1d500b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540224
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic0502659732c1957b297095a5332e6dc0b514397
2021-01-08 11:33:57 +00:00
Junyu Lai
3bd1e4ffb1
Revert "wifi: Add systemAPi:setSubscriberId in NetworkAgentConfig"
...
This reverts commit b36c519c4c .
Reason for revert: After discussion, we prefer to add a field in NetworkCapabilities instead. Sorry for inconvenience.
Change-Id: I2e8840a797df9d1594f2b8b576bcd45beb184fca
2021-01-08 19:22:28 +08:00
Treehugger Robot
67ae1d500b
Merge "Pivot network statistics to use DataInput/Output." am: 14b8536eb3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540224
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I86021070223e8825ba19bd84946ef89b56dc3f35
2021-01-08 10:56:59 +00:00
Les Lee
fe65e2d5c9
Merge "wifi: Add systemAPi:setSubscriberId in NetworkAgentConfig" am: 51115a8705 am: 78df78fef9 am: 7604c6c0ac
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536153
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8a491c13545e1dbe09f46081303dc33eed71a467
2021-01-08 10:41:27 +00:00
Treehugger Robot
14b8536eb3
Merge "Pivot network statistics to use DataInput/Output."
2021-01-08 10:33:16 +00:00
Les Lee
7604c6c0ac
Merge "wifi: Add systemAPi:setSubscriberId in NetworkAgentConfig" am: 51115a8705 am: 78df78fef9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536153
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4f4e7bfc059df3415378179b3d70ca35b8ebf4f1
2021-01-08 10:10:29 +00:00
Lorenzo Colitti
db35103974
Remove Vpn#isBlockingUid.
...
This code is no longer used. Delete it and the tests for it.
One of the tests checks that when a restricted profile is added,
the lockdown UID rules are updated to cover that profile as well.
ConnectivityServiceTest does not currently has coverage for this,
so add it.
Bug: 173331190
Test: moved unit test from VpnTest to ConnectivityServiceTest
Change-Id: Ic350b90946870890bf031668bb5c201037b0bd15
2021-01-08 15:35:55 +09:00
Les Lee
78df78fef9
Merge "wifi: Add systemAPi:setSubscriberId in NetworkAgentConfig" am: 51115a8705
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536153
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I59ab8adad819038715f7534ac746edbf923a92b9
2021-01-08 01:26:56 +00:00
Remi NGUYEN VAN
5b2ea5d193
Revert^2 "Move service-connectivity to the tethering APEX"
...
As part of modularization of ConnectivityService and expansion of the
Tethering module scope, move service-connectivity.jar into the tethering
APEX, and load it from there.
This rolls forward the change. The original topic was reverted because
of a bad merged-in clause; this is fixed and re-verified in this topic.
Bug: 171540887
Test: m, device boots and connectivity
Change-Id: I293b09c0dc04c6ccafa30cd0f1a63efe32283604
2021-01-08 01:23:36 +00:00
Les Lee
51115a8705
Merge "wifi: Add systemAPi:setSubscriberId in NetworkAgentConfig"
2021-01-08 00:54:51 +00:00
Jeff DeCew
3aa6043c46
Show LargeIcon as wide for apps targeting S.
...
* This does not inhibit the grouping behavior which demotes this image and shows it in a smaller square area on the left.
* This also converts the Notification class to calculate margins and sizes in DIP instead of PX, as that is more resilient.
Fixes: 175409684
Test: atest NotificationTemplateTest
Change-Id: I35d28c8df341dbbac2774026c6ca749e296c0482
2021-01-07 14:30:57 -05:00
Lorenzo Colitti
927845625a
Merge changes Iec22ff63,Iaca8a7cc am: 0cec61c277 am: de3c1f6764 am: 6aacbaac9c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528211
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I293366c6aac42f776ff23277a707d8c2ae0fd1b0
2021-01-07 19:22:06 +00:00
Automerger Merge Worker
e7f790ad01
Merge "Merge changes from topic "revert-1532910-connectivity_jar_in_apex-LKXFLQGLIU" am: 7de72f8875" into stage-aosp-master am: ba42f64156 am: ec5f9aed57
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541542
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0448f25d58933d747e6c9c896dc3362e72752744
2021-01-07 19:19:49 +00:00
Treehugger Robot
32228b1c5f
Merge changes from topic "revert-1532910-connectivity_jar_in_apex-LKXFLQGLIU" am: 7de72f8875 am: 56586b16dd am: 977ceb563f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541542
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie83aa9bcb14313bb721908c79a4d53d05e86eb99
2021-01-07 19:19:29 +00:00
Lorenzo Colitti
6aacbaac9c
Merge changes Iec22ff63,Iaca8a7cc am: 0cec61c277 am: de3c1f6764
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528211
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iad0d78dd0787d8eb1da38c208588414b7dfbbdac
2021-01-07 18:48:31 +00:00
Automerger Merge Worker
ec5f9aed57
Merge "Merge changes from topic "revert-1532910-connectivity_jar_in_apex-LKXFLQGLIU" am: 7de72f8875" into stage-aosp-master am: ba42f64156
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541542
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie22d1281939b2191304ecf3c9c8de54913f6aafe
2021-01-07 18:48:02 +00:00
Treehugger Robot
977ceb563f
Merge changes from topic "revert-1532910-connectivity_jar_in_apex-LKXFLQGLIU" am: 7de72f8875 am: 56586b16dd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541542
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie8e753e64eefa3a3d30a31af30c437411bf59ece
2021-01-07 18:48:00 +00:00
Lorenzo Colitti
de3c1f6764
Merge changes Iec22ff63,Iaca8a7cc am: 0cec61c277
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528211
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1a7da1cab20a38cec3e9610a537c6ba9d7a8308d
2021-01-07 18:16:43 +00:00
Automerger Merge Worker
ba42f64156
Merge "Merge changes from topic "revert-1532910-connectivity_jar_in_apex-LKXFLQGLIU" am: 7de72f8875" into stage-aosp-master
2021-01-07 18:10:58 +00:00
Treehugger Robot
56586b16dd
Merge changes from topic "revert-1532910-connectivity_jar_in_apex-LKXFLQGLIU" am: 7de72f8875
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541542
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I70cdc5ba92d03d76620db5fb2e78a65c9976539c
2021-01-07 18:06:23 +00:00