Commit Graph

2868 Commits

Author SHA1 Message Date
Treehugger Robot
a93cae0ec7 Merge "Add getters to UnderlyingNetworkInfo" am: 05d884470a am: b560e885f7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684651

Change-Id: I33d2bbca5a72ab8500a7886073c9f4c4d1b84925
2021-04-29 08:57:50 +00:00
Treehugger Robot
b560e885f7 Merge "Add getters to UnderlyingNetworkInfo" am: 05d884470a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684651

Change-Id: I97222bb04bdea78178741245016658cad7f082dc
2021-04-29 08:16:36 +00:00
Treehugger Robot
05d884470a Merge "Add getters to UnderlyingNetworkInfo" 2021-04-29 07:29:08 +00:00
Les Lee
1f366a8365 Merge "wifi data usage: support to get carrier merged wifi network." am: bef2f5be94 am: e0f1f83446
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538743

Change-Id: Ia115b6c8fe536d77071744374f5d42390cc50dbd
2021-04-27 04:13:08 +00:00
Les Lee
e0f1f83446 Merge "wifi data usage: support to get carrier merged wifi network." am: bef2f5be94
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538743

Change-Id: I01b6790de48a514256f51ebb85226e56c6e2f59b
2021-04-27 03:26:31 +00:00
Aaron Huang
433fb498b5 Add getters to UnderlyingNetworkInfo
Address API review feedback, add getters to UnderlyingNetworkInfo
instead of exposing fields.

Instead of wasting memory by converting this into an array, have
migrateTun take a List<String>. In turn, tunAdjustmentInit should
also take a List<String>.

(cherry picked from ag/14211075)
Bug: 183972554
Test: atest android.net.UnderlyingNetworkInfoTest
Merged-In: Id59744097208d91298a25ef110ade91a9cf291a1
Change-Id: Id59744097208d91298a25ef110ade91a9cf291a1
2021-04-22 22:30:42 +08:00
lesl
b2cd0b9e57 wifi data usage: support to get carrier merged wifi network.
Carrier merged wifi network is a specific cerrier wifi network
which provides the same user experience as mobile.

To support data usage accounting for carrier merged wifi,
the change provide several APIs in NetworkTemplate:

  1. extend buildTemplateWifi so it could be used for matching
     wifi networks with subscriber Id (IMSI).
  2. add buildTemplateCarrier to let
     NetworkPolicyManagerService creates a single policy for
     a given carrier regardless of network type.

Bug: 176396812
Test: atest -c NetworkTemplateTest
Test: atest -c NetworkStatsServiceTest
Test: Manual Test with test code on mobile and wifi network.
      1. buildTemplateCarrier includes the carrier wifi and
         mobile usage
      2. buildTemplateWifi can get carrier wifi usage and support the
         filter via subscriberId

Change-Id: I667b4adf3eec0bdd3a7385109dd8c1fae8e7be32
2021-04-19 16:13:27 +08:00
Treehugger Robot
d74319d883 Merge "Add documentation on EthernetNetworkSpecifier API" am: 682a98d823 am: f00ac501f4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669186

Change-Id: I8c8cd85bed535a868a55ec82721b35738efa4ae1
2021-04-09 02:29:15 +00:00
Treehugger Robot
f00ac501f4 Merge "Add documentation on EthernetNetworkSpecifier API" am: 682a98d823
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669186

Change-Id: I3ce2800bf2719b22c16c227dc3ded9a7db8f62c7
2021-04-09 02:03:01 +00:00
Remi NGUYEN VAN
212d6930cc Add documentation on EthernetNetworkSpecifier API
Add javadoc on the constructor and getInterfaceName method.

Fixes: 182979732
Test: m
Change-Id: Iced805149a8344b953331501b48184661be0053a
2021-04-08 15:32:08 +09:00
Aaron Huang
0a8439db0b Merge changes I5ed1bc8b,Ie9e6af0e am: 834026197f am: 5a4bd548f1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645290

Change-Id: Ia0f9ad67aaf675e8190d52e5814dbe855021a8b3
2021-04-06 14:41:28 +00:00
Aaron Huang
83f11c333c Migrate hidden API in IpConfigStore to formal API am: ace9a3d468 am: 0994e5b8c4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1577123

Change-Id: I7ef352c7213864ee2ff99c5a2517fb1b9e68d1d2
2021-04-06 14:41:24 +00:00
Aaron Huang
5a4bd548f1 Merge changes I5ed1bc8b,Ie9e6af0e am: 834026197f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645290

Change-Id: I9fe40b60f31f0897f8cb62a39787536cd5524157
2021-04-06 14:06:51 +00:00
Aaron Huang
0994e5b8c4 Migrate hidden API in IpConfigStore to formal API am: ace9a3d468
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1577123

Change-Id: I218559824dc81cc1b57f17ef43f3fb29ec0fc4f5
2021-04-06 14:03:54 +00:00
Aaron Huang
cdbde20884 Fix IpConfigStore dependencies on framework-connectivity
This change fixes IpConfigStore dependencies on framework-connectivity
hidden APIs.
- Use the version of SystemApi to new RouteInfo.
- Inline the implementation of isIPv4Default() directly because
  isDefaultRoute() is a public API so it can be used in this class.

(cherry-picked from ag/13945685)
Bug: 178777253
Test: FrameworksServicesTests:IpConfigStoreTest
Merged-In: I5ed1bc8bc8bee5b0c795fd8577a2d64628998e51
Change-Id: I5ed1bc8bc8bee5b0c795fd8577a2d64628998e51
2021-04-06 07:18:06 +00:00
Aaron Huang
ace9a3d468 Migrate hidden API in IpConfigStore to formal API
IpConfiguration and StaticIpConfiguration are included
in framework-connectivity which cannot have external
hidden API usages dependencies on them. IpConfiguration
and StaticIpConfiguration provide builder and getter
methods for the fields of the objects which are formal APIs.
So, replace the usages in IpConfigStore with those formal
APIs to remove the dependencies.

(cherry-picked from ag/13929104)
Bug: 178777253
Test: FrameworksServicesTests:IpConfigStoreTest
Merged-In: Ie9e6af0efe2c39667bb8faa1e3a498b1f61e1432
Change-Id: Ie9e6af0efe2c39667bb8faa1e3a498b1f61e1432
2021-04-06 07:13:56 +00:00
Les Lee
6da1dc6363 Merge "Fix Wi-Fi SSID null handling" am: cadd76044e am: 0685b82ee2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624059

Change-Id: I9dacf92104c544f9ed12dc6fa60e4895ab228cbd
2021-04-06 05:24:54 +00:00
Les Lee
0685b82ee2 Merge "Fix Wi-Fi SSID null handling" am: cadd76044e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624059

Change-Id: I92537bac7a2762a74a1df051efa1600fdf381eeb
2021-04-06 04:42:57 +00:00
lesl
1c4cd5c1d8 Fix Wi-Fi SSID null handling
When Wi-Fi SSID is null in NetworkCapabilities,
get Wi-Fi SSID from connection info (WifiInfo) which is non-null design.

Bug: 176396812
Test: FrameworksNetTests NetworkPolicyManagerServiceTest
Change-Id: I59c7d8f7e176d0c6bb100721269f3f6165f0ca21
2021-03-30 23:57:56 +08:00
Junyu Lai
e5144d8d44 Merge "[SP31] Expose onSetWarningAndLimit System API" am: fc6a6628b9 am: 5d4287d895
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625864

Change-Id: I022b2d130729f31fbd3fe8edaec6c998cdcd2aa4
2021-03-30 09:00:57 +00:00
Junyu Lai
5d4287d895 Merge "[SP31] Expose onSetWarningAndLimit System API" am: fc6a6628b9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625864

Change-Id: I7a95af1d2879fce22e1e644923661ccbc2253f26
2021-03-30 08:19:25 +00:00
Junyu Lai
fc6a6628b9 Merge "[SP31] Expose onSetWarningAndLimit System API" 2021-03-30 08:00:45 +00:00
Junyu Lai
f638eae6b4 Merge "[SP29] Send interface warning bytes to NetworkStatsProvider" am: 8ce0afea2f am: 5bf5e2f58f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470723

Change-Id: I6d799819362fd7d89b6be691d15c49314c867734
2021-03-30 03:30:15 +00:00
Junyu Lai
5bf5e2f58f Merge "[SP29] Send interface warning bytes to NetworkStatsProvider" am: 8ce0afea2f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470723

Change-Id: I9004a9af67fffc90c1d9f8ff18448d2258caf5ba
2021-03-30 03:10:57 +00:00
Junyu Lai
8ce0afea2f Merge "[SP29] Send interface warning bytes to NetworkStatsProvider" 2021-03-30 02:56:25 +00:00
Junyu Lai
c462315620 Merge "[SP28] Add API for set data warning" am: f1a1d71020 am: e09bf898ea
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469125

Change-Id: I43fa10034699732b6091fe290a4e064478c8a0e1
2021-03-29 12:12:19 +00:00
Junyu Lai
e09bf898ea Merge "[SP28] Add API for set data warning" am: f1a1d71020
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469125

Change-Id: Ibdf919a762952350dc89bda59724b2f0cb291313
2021-03-29 11:30:37 +00:00
Junyu Lai
f1a1d71020 Merge "[SP28] Add API for set data warning" 2021-03-29 11:06:05 +00:00
Junyu Lai
175a1d4e49 Merge "Support Dual ViLTE stats" am: df875106a7 am: 4ea19cf4b0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540920

Change-Id: Iaa7d8d3dcb106cd19777fe1ff64db5ab4ea75991
2021-03-29 08:26:07 +00:00
Junyu Lai
4ea19cf4b0 Merge "Support Dual ViLTE stats" am: df875106a7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540920

Change-Id: Ie65e2a2530b3e10b1cb7b571bbe4e7255caf1b08
2021-03-29 07:37:34 +00:00
Junyu Lai
df875106a7 Merge "Support Dual ViLTE stats" 2021-03-29 06:59:19 +00:00
Lucas Lin
2c8aab4b61 Merge changes I6d5dd0a8,I106b3e4f am: 0cf3234045 am: 12ecb8f040
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653932

Change-Id: Ic04621eaa36aa0b2837dced4730d32f415f8dc13
2021-03-25 12:22:16 +00:00
Lucas Lin
24f46aaa90 Merge "Use getAllInterfaceNames to get all interface names" am: c4c056b647 am: ef4b30c59d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653937

Change-Id: I2a51fc361a3ef6fe7a99fe70e8c47fdffa2903bd
2021-03-25 12:21:20 +00:00
Lucas Lin
12ecb8f040 Merge changes I6d5dd0a8,I106b3e4f am: 0cf3234045
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653932

Change-Id: Ife29dba8549f9b86cfe757a59fd4c8e61e55738f
2021-03-25 11:46:03 +00:00
Lucas Lin
ef4b30c59d Merge "Use getAllInterfaceNames to get all interface names" am: c4c056b647
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653937

Change-Id: I42de5ac3508b7947ac3b53717f1133ea6aa8588c
2021-03-25 11:30:31 +00:00
Lucas Lin
0cf3234045 Merge changes I6d5dd0a8,I106b3e4f
* changes:
  Use public API Network#getNetId() to get netid
  Remove unused import IConnectivityManager
2021-03-25 10:49:35 +00:00
lucaslin
20966d9193 Use public API Network#getNetId() to get netid
Network class will be a part of mainline module, external callers
cannot call its hidden constant. Use public API - getNetId() to
get netid instead.

Bug: 182963397
Test: m
Change-Id: I6d5dd0a8c3879df7bdc1d58e36022045c303bb40
Merged-In: I6d5dd0a8c3879df7bdc1d58e36022045c303bb40
  (cherry-picked from ag/13927649)
2021-03-25 10:48:55 +00:00
lucaslin
11e8857033 Use getAllInterfaceNames to get all interface names
The current design is using hidden API - getStackedLinks() to
get LinkProperties then call getInterfaceName() to get the
interface name. In fact, this behavior could be replaced by
system API - getAllInterfaceNames().

Bug: 182963397
Test: atest FrameworksNetTests
Test: atest CtsNetTestCases
Change-Id: Id2b19dc5099355af69d23a6d99d2b7e6c0e1e88a
Merged-In: Id2b19dc5099355af69d23a6d99d2b7e6c0e1e88a
  (cherry-picked from ag/13927660)
2021-03-25 08:10:28 +00:00
junyulai
47597b92ab [SP31] Expose onSetWarningAndLimit System API
Test: atest NetworkPolicyManagerServiceTest NetworkStatsServiceTest
Bug: 149467454
CTS-Coverage-Bug: 183598414
Merged-In: I6f5e22e3a7b80a38cae9f3c5d7296a1dff34facf
Change-Id: I6f5e22e3a7b80a38cae9f3c5d7296a1dff34facf
  (cherry-picked from ag/13981689)
2021-03-25 09:32:43 +08:00
junyulai
8947c7125a [SP29] Send interface warning bytes to NetworkStatsProvider
This change contains necessary modification in NPMS and NSS
to send warning bytes to NetworkStatsProvider. But since
no any provider has been upgraded to handle such parameter.
Thus, no behavior change is made in this patch.

Test: atest NetworkPolicyManagerServiceTest NetworkStatsServiceTest
Test: atest NetworkPolicyManagerServiceTest#testStatsProviderWarningAndLimitReached
Bug: 149467454
Bug: 170699770
Bug: 170179169
Merged-In: I6c4863030c36328db571294fd12a40e59864def5
Change-Id: I6c4863030c36328db571294fd12a40e59864def5
  (cherry-picked from ag/13982166)
2021-03-25 09:23:24 +08:00
junyulai
d66c225def [SP28] Add API for set data warning
To have better control and race-free of set data warning
to tether offload hardware, an interface of set warning and
limit at the same time in the NetworkStatsProvider is needed.

This is a no-op change which expose such interface with minimum
changes in service side to get build pass. The implementation
would be included in follow-up patches.

Test: atest NetworkStatsServiceTest
Test: atest NetworkPolicyManagerServiceTest
Test: atest GtsNetworkStackHostTestCases
Test: m doc-comment-check-docs
Bug: 149467454
Bug: 170699770
Bug: 170179169
Merged-In: I6ee661497f7dedb871c85786d1950cab951d8aa2
Change-Id: I6ee661497f7dedb871c85786d1950cab951d8aa2
  (cherry-picked from ag/13959436)
2021-03-24 22:48:26 +08:00
Chalard Jean
9c2d78e605 Merge "Annotate NSM heavy methods with @WorkerThread" am: e096339dc3 am: 6e3de2d9b6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625859

Change-Id: I4091f82e7b95901a88cd9528c92df4519fb3edd1
2021-03-17 03:08:28 +00:00
Chalard Jean
6e3de2d9b6 Merge "Annotate NSM heavy methods with @WorkerThread" am: e096339dc3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625859

Change-Id: Id925979c238c8ae482dbb9c78bf7f4e0f27255d6
2021-03-17 02:26:48 +00:00
Chalard Jean
e096339dc3 Merge "Annotate NSM heavy methods with @WorkerThread" 2021-03-17 02:03:22 +00:00
Zhengyu Zhan
63a5820b4f Support Dual ViLTE stats
Some operator supports multiple VILTE,
both two SIM cards can make VILTE call.
We need to record VILTE data to different interface.
Now NetworkStatsService has only one VILTE data
interface: "vt_data0". All VILTE data stats will
be recorded in this interface.

Bug: 130871087
Test: NetworkStatsServiceTest#testDualVilteProviderStats
Change-Id: I000ec756827bc42cac88dd0a2ca6b7999252357e
2021-03-15 10:00:59 +08:00
Lucas Lin
a7baeed6a6 Merge changes Ib80f814f,Ic605e489 am: 02929bde11 am: 39e98823a3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626209

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f41a9cd27dd37c859e69fe02a32b9ab13fb0d46
2021-03-12 04:34:22 +00:00
Lucas Lin
39e98823a3 Merge changes Ib80f814f,Ic605e489 am: 02929bde11
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626209

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94fd187e5f2cc0428807668f82b3a29ad8b66c47
2021-03-12 03:56:18 +00:00
Lucas Lin
02929bde11 Merge changes Ib80f814f,Ic605e489
* changes:
  Use new API - getIpSecNetIdRange() in IpSecService
  Add a new API to get the network ID range of IPSec tunnel interface
2021-03-12 03:30:32 +00:00
Remi NGUYEN VAN
71bd83fe19 Add Ethernet, TestNetworkSpecifier API am: 65949518fa am: cd075295ae
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I63159846579c43c721eeb86c9a55faa3f2888be8
2021-03-12 00:26:45 +00:00
Remi NGUYEN VAN
cd075295ae Add Ethernet, TestNetworkSpecifier API am: 65949518fa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a1b38fb6b8b6831bac016a8352ae9073758f9af
2021-03-12 00:10:08 +00:00