Commit Graph

3459 Commits

Author SHA1 Message Date
Les Lee
44c302a5d8 Merge "carrier data usage: Use carrier template as default policy" am: acbea9a48e am: 03c6e3190c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563312

Change-Id: I28386f42011e5b65cc1219b947eff2057d1f0848
2021-06-03 09:14:20 +00:00
Les Lee
03c6e3190c Merge "carrier data usage: Use carrier template as default policy" am: acbea9a48e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563312

Change-Id: Ie10a2dfe6c959a591cda641863af873eea409a37
2021-06-03 08:18:16 +00:00
lesl
0d14803a32 carrier data usage: Use carrier template as default policy am: 35a6e5507e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14782679

Change-Id: I8bdde6aaeea04c4c70a37d5a71ad31a5590323a9
2021-06-02 04:01:14 +00:00
Les Lee
acbea9a48e Merge "carrier data usage: Use carrier template as default policy" 2021-06-01 10:42:08 +00:00
lesl
35a6e5507e carrier data usage: Use carrier template as default policy
The carrier network means any network which linked with sepcific
subscriberId (for instances: merged Wifi or mobile).
Update default policy to use carrier network template to replace mobile
template.

No impact for current AOSP user because no any wifi network is merged
wifi. (Because the merged wifi network requires to support from the wifi module).

Also this change convert all of the old policies which template is
TYEP_MOBILE to TYPE_CARRIER to match the default policy.

Bug: 176396812
Test: atest -c NetworkPolicyManagerServiceTest
Test: atest -c CtsHostsideNetworkTests
Test: Manual Test with test code (Force wifi to merged wifi).
      The data will limit when using merged wifi.
      And mobile policy also work normally.

Merged-In: I33c10f7549e713c52ce9afd5b8c4cce2abbda616
Change-Id: I33c10f7549e713c52ce9afd5b8c4cce2abbda616
2021-06-01 18:12:56 +08:00
Pavan Kumar M
1c5ecec86d 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: I355fc9bd127da83c1dc70ab3b1261346d4fa5de0
2021-05-26 08:09:31 +00:00
TreeHugger Robot
e2288b75b5 [automerger skipped] Merge "Improve documentation of IpSecTunnelInterface#setUnderlyingNetwork" into sc-dev am: 7e982787e1 -s ours
am skip reason: Merged-In I2e3c4fe735b3374b2ff6d23850970e36c0aafda5 with SHA-1 6b1f3eaf12 is already in history

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

Change-Id: Id39a25cc0292dcbdfc91df1347433f278f5954bd
2021-05-21 09:21:19 +00:00
Treehugger Robot
4ccd2e2d87 Improve documentation of IpSecTunnelInterface#setUnderlyingNetwork
Clarify the consequence of adding IpSecTunnelInterface to the
underlying network.

Bug: 169855650
Test: builds
Change-Id: I2e3c4fe735b3374b2ff6d23850970e36c0aafda5
Merged-In: I2e3c4fe735b3374b2ff6d23850970e36c0aafda5
2021-05-20 21:56:26 +00:00
Treehugger Robot
17304a67fd Merge "Improve documentation of IpSecTunnelInterface#setUnderlyingNetwork" am: 9625c2df35 am: de7add3201
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1590415

Change-Id: I02207954757c9135fbf6674720dd8e623fc9e435
2021-05-20 21:22:32 +00:00
Treehugger Robot
de7add3201 Merge "Improve documentation of IpSecTunnelInterface#setUnderlyingNetwork" am: 9625c2df35
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1590415

Change-Id: I38c900b277fa668fe66d6ac6f6a5230ad2c50920
2021-05-20 20:53:07 +00:00
Treehugger Robot
9625c2df35 Merge "Improve documentation of IpSecTunnelInterface#setUnderlyingNetwork" 2021-05-20 20:33:41 +00:00
lesl
41e74f4334 carrier data usage: Use carrier template as default policy
The carrier network means any network which linked with sepcific
subscriberId (for instances: merged Wifi or mobile).
Update default policy to use carrier network template to replace mobile
template.

No impact for current AOSP user because no any wifi network is merged
wifi. (Because the merged wifi network requires to support from the wifi module).

Also this change convert all of the old policies which template is
TYEP_MOBILE to TYPE_CARRIER to match the default policy.

Bug: 176396812
Test: atest -c NetworkPolicyManagerServiceTest
Test: atest -c CtsHostsideNetworkTests
Test: Manual Test with test code (Force wifi to merged wifi).
      The data will limit when using merged wifi.
      And mobile policy also work normally.

Change-Id: I33c10f7549e713c52ce9afd5b8c4cce2abbda616
2021-05-20 23:46:39 +08:00
Les Lee
e5f759ef7e [automerger skipped] Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev am: aca6568d23 -s ours
am skip reason: Merged-In Ia033521a24e2bb56182d74a41bb2b39710571782 with SHA-1 dfc7237743 is already in history

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

Change-Id: If1a3eeb5077d7b078a3be260e01c4cf3f6790437
2021-05-20 09:06:38 +00:00
Les Lee
aca6568d23 Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev 2021-05-20 08:55:59 +00:00
Les Lee
0d707170e2 [automerger skipped] Merge "Add metered filter for API: buildTemplateCarrier" into sc-dev am: 255253242f -s ours
am skip reason: Merged-In I7196d62bb60844458a6c4b1d94e2baccb71e15cd with SHA-1 249507940f is already in history

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

Change-Id: Ica7cf82e3d17cbe5d0577e14faa563cfbfdc9385
2021-05-19 14:48:10 +00:00
Les Lee
255253242f Merge "Add metered filter for API: buildTemplateCarrier" into sc-dev 2021-05-19 14:32:29 +00:00
Junyu Lai
f5aef5a3c4 [automerger skipped] Merge changes I3ba50cbd,I970ee365 into sc-dev am: b987babf5e -s ours
am skip reason: Merged-In I3ba50cbd8a7f60779c69ba85e10dc3cc8a52f8b1 with SHA-1 a081acd610 is already in history

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

Change-Id: Ic87d5b62ddd55ec1c264839dd84c3c375794e428
2021-05-19 12:57:00 +00:00
lesl
067a1d2448 Add metered filter for API: buildTemplateCarrier
This CL modifies NetworkTemplate#buildTemplateCarrier to force on
metered carrier network and rename to buildTemplateCarrierMetered.
This method was introduced recently and has no callers.

This method will be used in Settings and NetworkPolicyManagerService
to display and manage data usage on carrier metered networks.

Settings/NetworkPolicyManagerService will use it instead of the existing
method buildTemplateMobileAll method, which only matches metered networks.
That code will change from matching metered mobile networks to matching
metered carrier networks.

Note: The carrier metered network includes metered mobile network and
metered "merged carrier wifi network" that is a specific cerrier wifi network
which provides the same user experience as mobile.

Bug: 176396812
Test: atest -c NetworkTemplateTest
Change-Id: I7196d62bb60844458a6c4b1d94e2baccb71e15cd
Merged-In: I7196d62bb60844458a6c4b1d94e2baccb71e15cd
2021-05-19 02:53:39 +00:00
lesl
ee39c8deec Support to query TYPE_WIFI usage with subscriberId
Previous the API ignores subscriberId when network type is WIFI.
Allow caller to call querySummaryXXXX with TYPE: WIFI
+ subscriberId: IMSI to get carrier merged wifi usage which matches the wifi
network with the given IMSI.

Bug: 176396812
Test: atest -c NetworkStatsServiceTest
Change-Id: Ia033521a24e2bb56182d74a41bb2b39710571782
Merged-In: Ia033521a24e2bb56182d74a41bb2b39710571782
2021-05-19 02:53:16 +00:00
Chris Weir
138711ed9e Merge "Print human-readable OEM managed states" am: 9374ca2698 am: e71bec661e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1636561

Change-Id: I4ecc049acf7a5f2e3c99808c7e5f6c2f064d7e5c
2021-05-18 17:39:57 +00:00
Chris Weir
e71bec661e Merge "Print human-readable OEM managed states" am: 9374ca2698
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1636561

Change-Id: I38380b1f6a80fdfbbcc21124470929530131fcdd
2021-05-18 17:03:21 +00:00
Chris Weir
9374ca2698 Merge "Print human-readable OEM managed states" 2021-05-18 16:29:26 +00:00
Les Lee
d9f66d5beb Merge "Support to query TYPE_WIFI usage with subscriberId" am: 15672a8a12 am: 722aab0208
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608057

Change-Id: Ifeaab15fbf20b318bb7b35aa6b4604f21e2c98a1
2021-05-18 13:57:43 +00:00
Les Lee
6736657d56 Merge "Add metered filter for API: buildTemplateCarrier" am: 7c60bfb320 am: 9366d34196
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699687

Change-Id: I46d8d8f0d9b83fb0a817a3455cbbc28d558b871c
2021-05-18 13:57:06 +00:00
Les Lee
722aab0208 Merge "Support to query TYPE_WIFI usage with subscriberId" am: 15672a8a12
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608057

Change-Id: I753603201bd935af055cf25135e4f8faf436bf2a
2021-05-18 13:35:08 +00:00
Les Lee
9366d34196 Merge "Add metered filter for API: buildTemplateCarrier" am: 7c60bfb320
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699687

Change-Id: Iac42f02079de5c0507209741e648b13da667fb94
2021-05-18 13:26:24 +00:00
Les Lee
15672a8a12 Merge "Support to query TYPE_WIFI usage with subscriberId" 2021-05-18 13:02:07 +00:00
Les Lee
7c60bfb320 Merge "Add metered filter for API: buildTemplateCarrier" 2021-05-18 13:01:38 +00:00
junyulai
5f8c0b0b6b [FUI27] Fix internal naming of notifyNetworkStatus
Test: TH
Bug: 174123988
Merged-In: I970ee365ca221956ee85788005d331374b5fa71a
Change-Id: I970ee365ca221956ee85788005d331374b5fa71a
  (cherry-picked from aosp/1620539)
2021-05-17 14:07:00 +08:00
lesl
dfc7237743 Support to query TYPE_WIFI usage with subscriberId
Previous the API ignores subscriberId when network type is WIFI.
Allow caller to call querySummaryXXXX with TYPE: WIFI
+ subscriberId: IMSI to get carrier merged wifi usage which matches the wifi
network with the given IMSI.

Bug: 176396812
Test: atest -c NetworkStatsServiceTest
Change-Id: Ia033521a24e2bb56182d74a41bb2b39710571782
2021-05-16 22:18:32 +08:00
Junyu Lai
f28cadc9d0 Merge changes I3ba50cbd,I970ee365 am: 37f2408143 am: 0d3416dcea
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620859

Change-Id: If9a3e37e5359b955e330002d81cbeb48f90ee22b
2021-05-15 17:24:42 +00:00
Junyu Lai
0d3416dcea Merge changes I3ba50cbd,I970ee365 am: 37f2408143
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620859

Change-Id: I2cf4ea0abb1ff7bc74302cce16cbe8041b08d321
2021-05-15 16:53:30 +00:00
junyulai
b679f00398 [FUI27] Fix internal naming of notifyNetworkStatus
Test: TH
Bug: 174123988
Change-Id: I970ee365ca221956ee85788005d331374b5fa71a
2021-05-14 19:48:17 +08:00
Aaron Huang
5826897604 [automerger skipped] Merge "Rename *Iface* APIs to *Interface*" am: f281058618 am: e18b1c815f am: 872cbed05f -s ours
am skip reason: Merged-In I38b476e762fb57fa88c4a789092d0af6f5330d80 with SHA-1 4ddc7c782f is already in history

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

Change-Id: I39709941a1770435d9a2e221025b46eed5d32ea0
2021-05-14 10:07:18 +00:00
Aaron Huang
872cbed05f Merge "Rename *Iface* APIs to *Interface*" am: f281058618 am: e18b1c815f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1693585

Change-Id: I9aa62677f52ac78916c518d1378a05bda143f676
2021-05-14 09:44:33 +00:00
Aaron Huang
e18b1c815f Merge "Rename *Iface* APIs to *Interface*" am: f281058618
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1693585

Change-Id: I62fa0403c8b2d78e7e7a90be8ac804576ec27456
2021-05-14 09:36:36 +00:00
Aaron Huang
fb5fbaba33 Rename *Iface* APIs to *Interface*
Address API review feedback, other APIs have been refering to
these as "interface" instead of "iface" so migrate the APIs named
*Iface* to *Interface*.

(cherry-picked from ag/14326779)
Bug: 183972554
Test: atest android.net.UnderlyingNetworkInfoTest
Merged-In: I38b476e762fb57fa88c4a789092d0af6f5330d80
Change-Id: I38b476e762fb57fa88c4a789092d0af6f5330d80
2021-05-14 11:05:22 +08:00
lesl
249507940f Add metered filter for API: buildTemplateCarrier
This CL modifies NetworkTemplate#buildTemplateCarrier to force on
metered carrier network and rename to buildTemplateCarrierMetered.
This method was introduced recently and has no callers.

This method will be used in Settings and NetworkPolicyManagerService
to display and manage data usage on carrier metered networks.

Settings/NetworkPolicyManagerService will use it instead of the existing
method buildTemplateMobileAll method, which only matches metered networks.
That code will change from matching metered mobile networks to matching
metered carrier networks.

Note: The carrier metered network includes metered mobile network and
metered "merged carrier wifi network" that is a specific cerrier wifi network
which provides the same user experience as mobile.

Bug: 176396812
Test: atest -c NetworkTemplateTest
Change-Id: I7196d62bb60844458a6c4b1d94e2baccb71e15cd
2021-05-14 11:04:17 +08:00
Aaron Huang
78d14d912d Merge "Add return type javadoc to NetworkStateSnapshot#getLegacyType" into sc-dev 2021-05-12 05:11:45 +00:00
Benedict Wong
3187e37397 Merge "Add clarifying comments on for IPsec forward policies" am: 1a88665f3c am: 5ef4da5dd2 am: 9f8e6cc2a9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702525

Change-Id: I77e806ab3e76307dfc6456b210f691027aaeec66
2021-05-11 18:13:01 +00:00
Benedict Wong
9f8e6cc2a9 Merge "Add clarifying comments on for IPsec forward policies" am: 1a88665f3c am: 5ef4da5dd2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702525

Change-Id: Ifef0b1d3a1def9dfcf995fb5ddc79c0a88658ad0
2021-05-11 17:48:00 +00:00
Benedict Wong
5ef4da5dd2 Merge "Add clarifying comments on for IPsec forward policies" am: 1a88665f3c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702525

Change-Id: I7267d331065ceadb830a14170920810f053eacb8
2021-05-11 17:17:53 +00:00
Benedict Wong
97a1eefdbb Merge changes from topic "vcn-fwd" am: d7d2d2a15b am: a47a93c64d am: 66f42f23f0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682047

Change-Id: I745687f69366657dc33bfdacd878e06affd6a8ec
2021-05-11 06:10:32 +00:00
Benedict Wong
66f42f23f0 Merge changes from topic "vcn-fwd" am: d7d2d2a15b am: a47a93c64d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682047

Change-Id: I4e11bdfa3e887103673a354aad7f9b5fa746ac9e
2021-05-11 05:52:26 +00:00
Benedict Wong
a47a93c64d Merge changes from topic "vcn-fwd" am: d7d2d2a15b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682047

Change-Id: I7f02785727c73c27ac498ad4663f25252242c6e0
2021-05-11 05:26:46 +00:00
Benedict Wong
0c8ff5c720 Add clarifying comments on for IPsec forward policies
This change adds clarifying comments for the usage of the forward
policies in IPsec, and corrects a comment to properly specify the
permissions allowed.

Bug: 185495453
Test: Comment-only changes
Change-Id: I6d36522c344c41b0ebd90d46b216d115b678dd31
2021-05-10 18:26:02 -07:00
Aaron Huang
3f1b6f2aaa Add return type javadoc to NetworkStateSnapshot#getLegacyType
Add javadoc to document the return type is the legacy network
type in getLegacyType.

Bug: 183972826
Test: only update javadoc
Change-Id: I7757253af5955f7d489d6349c090dcba146cfd7f
2021-05-10 23:18:41 +08:00
Benedict Wong
1684f790d9 Add internal support for IPsec forward policies
This change adds support for IPsec forward policies, which are necessary
for packets to be allowed to be forwarded to another interface, as is
the case with tethering. This is necessary and useful only within the
system server, and as such is not exposed as a public API.

This change is safe, since the addition of a FWD policy on IPsec tunnel
interfaces will by default block forwarded traffic (as would be the case
without this patch). In the event that the (system) owner of the tunnel
requires support for forwarded packets (eg tethering), this patch allows
application of transforms in the FWD direction as well.

This will be used to ensure that the VCN can be used as the underlying
network for the purposes of tethering.

Bug: 185495453
Test: atest IpSecServiceTest
Test: atest IpSecServiceParameterizedTest
Test: manual testing with tethering over VCN
Change-Id: I74ecea71f1954029f6fbdbe34598c82e0aac386b
2021-05-07 15:09:42 -07:00
Chris Weir
0492286d6f Print human-readable OEM managed states
For NetworkTemplate and NetworkIdentity, print human-readable
representations of the OEM managed state in the classes' respective
toString() functions.

Bug: 180557699
Test: Manual - run atest NetworkTemplateTest NetworkIdentityTest
and verify that the logcat output shows the String representation of the
OEM managed state correctly.

Change-Id: Ia180b911f91f41937ac713e6b3691d82f682e146
2021-05-07 10:26:31 -07:00
TreeHugger Robot
391a73f65c [automerger skipped] Merge "[SP31] Expose onSetWarningAndLimit System API" into mainline-prod am: 0bc22e9ff7 -s ours
am skip reason: Merged-In I6f5e22e3a7b80a38cae9f3c5d7296a1dff34facf with SHA-1 a22175603b is already in history

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

Change-Id: Ic7a9537554cbd290393111086ed8a691744cb33c
2021-05-07 04:10:53 +00:00