Commit Graph

552 Commits

Author SHA1 Message Date
Junyu Lai
b338bb602c Merge "[MS68.1] Register usage callback from NetworkPolicyManagerService" 2022-01-25 13:30:57 +00:00
Frank
9d749d5128 [DU09-0]Adding the NetworkStatsCollection Builder
The purpose is provide NetworkStatsCollection.Builder as
public API for adding the stats {@link NetworkStatsHistory}

Bug: 215862801
Test: atest NetworkStatsCollectionTest
Change-Id: I65ad589473cbb7785cbe8297f793ce9f18a55c35
2022-01-25 18:46:01 +08:00
Frank
7b5a3a20b8 [DU09-0]Adding the NetworkStatsCollection Builder
The purpose is provide NetworkStatsCollection.Builder as
public API for adding the stats {@link NetworkStatsHistory}

Bug: 215862801
Test: atest NetworkStatsCollectionTest
Change-Id: I65ad589473cbb7785cbe8297f793ce9f18a55c35
2022-01-25 18:46:01 +08:00
Junyu Lai
82a33b8e64 [MS69.1] Fix TrafficStats.init crashs for supplemental process
Supplemental apps has limited capabilities and service discovery
is restricted. Hence, calling TrafficStats.init would result in
crash.

This change includes:
1. Print log instead of crashing process when running into
   any unexpected cases.

Test: atest SupplementalProcessManagerTests
Bug: 216062904
Change-Id: I7f827ccc485c997745779053b5936a6cb30e8219
2022-01-25 09:59:38 +00:00
Junyu Lai
3355c400b7 [MS69.1] Fix TrafficStats.init crashs for supplemental process
Supplemental apps has limited capabilities and service discovery
is restricted. Hence, calling TrafficStats.init would result in
crash.

This change includes:
1. Print log instead of crashing process when running into
   any unexpected cases.

Test: atest SupplementalProcessManagerTests
Bug: 216062904
Change-Id: I7f827ccc485c997745779053b5936a6cb30e8219
2022-01-25 09:59:38 +00:00
Junyu Lai
8bf85e282d Merge "[MS67.1] Expose registerUsageCallback with template" am: a88cab0f1f am: 3d505ef365 am: 3871124e53 am: 1592dc049a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956051

Change-Id: I2802905935a312d0de7c7a29d296ea49a9aff701
2022-01-25 02:14:29 +00:00
Junyu Lai
7d9afb48f3 Merge "[MS61] Remove NetworkManagementSocketTagger#install dependency" am: 914ef6bb34 am: a4b472a38f am: 172ddfea29 am: b39f3e6f2f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952099

Change-Id: I6b3b75ddd650fb52983def1c05b581b0048f329d
2022-01-25 01:52:16 +00:00
Junyu Lai
a88cab0f1f Merge "[MS67.1] Expose registerUsageCallback with template" 2022-01-25 01:23:45 +00:00
Junyu Lai
ce13cf7c32 Merge "[MS67.1] Expose registerUsageCallback with template" 2022-01-25 01:23:45 +00:00
Junyu Lai
914ef6bb34 Merge "[MS61] Remove NetworkManagementSocketTagger#install dependency" 2022-01-25 00:48:23 +00:00
Junyu Lai
1c111cb189 Merge "[MS61] Remove NetworkManagementSocketTagger#install dependency" 2022-01-25 00:48:23 +00:00
Junyu Lai
266922cfdc Merge changes I54c2258c,I47b2d3ac am: 546ae74ab9 am: 29c1aee4be am: 2e8ddd67a6 am: bf1c9f3473
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1936446

Change-Id: Ic7b262291dca40fc8658459a691750ed467795e5
2022-01-24 14:35:28 +00:00
Junyu Lai
546ae74ab9 Merge changes I54c2258c,I47b2d3ac
* changes:
  [MS38] Remove android.os.HandlerExecutor dependencies
  [MS58] Expose Apis which will be used by data migration utility
2022-01-24 14:08:56 +00:00
Junyu Lai
5bfd449261 Merge changes I54c2258c,I47b2d3ac
* changes:
  [MS38] Remove android.os.HandlerExecutor dependencies
  [MS58] Expose Apis which will be used by data migration utility
2022-01-24 14:08:56 +00:00
Xiao Ma
cfae07d351 Merge "Move Ethernet related files to f/b/packages/ConnectivityT." am: 84b61cfcda am: bda00a9303 am: df8b9900b1 am: b72b3f33fd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1934465

Change-Id: I3c77b13525165ef3376b143485ad0a6671ce9ceb
2022-01-24 13:50:35 +00:00
junyulai
f6487fb3c1 [MS68.1] Register usage callback from NetworkPolicyManagerService
Use usage callback to replace the need of intent receiver.

Test: atest TrafficStatsTest NetworkUsageStatsTest FrameworksNetTests
Bug: 204830222
Change-Id: I40967c2b6c86d25c7db93e6d3a4908b72ed76154
2022-01-24 21:07:04 +08:00
junyulai
9d3e717016 [MS68.1] Register usage callback from NetworkPolicyManagerService
Use usage callback to replace the need of intent receiver.

Test: atest TrafficStatsTest NetworkUsageStatsTest FrameworksNetTests
Bug: 204830222
Change-Id: I40967c2b6c86d25c7db93e6d3a4908b72ed76154
2022-01-24 21:07:04 +08:00
Xiao Ma
84b61cfcda Merge "Move Ethernet related files to f/b/packages/ConnectivityT." 2022-01-24 12:50:39 +00:00
Xiao Ma
3de326cf99 Merge "Move Ethernet related files to f/b/packages/ConnectivityT." 2022-01-24 12:50:39 +00:00
Aaron Huang
9db383cf1d Use public resouce in android.R package
Use public resource since IpSec is planed to be moved into
Connectivity mainline module.

Bug: 204153604
Test: build
Change-Id: I0aafef6b9b08307c3aebce597a2dd24925c6b09a
Merged-In: I0aafef6b9b08307c3aebce597a2dd24925c6b09a
2022-01-24 11:41:35 +00:00
Aaron Huang
c0e50ee02d Use public resouce in android.R package
Use public resource since IpSec is planed to be moved into
Connectivity mainline module.

Bug: 204153604
Test: build
Change-Id: I0aafef6b9b08307c3aebce597a2dd24925c6b09a
Merged-In: I0aafef6b9b08307c3aebce597a2dd24925c6b09a
2022-01-24 11:41:35 +00:00
junyulai
18a2105afa [MS67.1] Expose registerUsageCallback with template
Test: atest FrameworksNetTests
Bug: 204830222
Change-Id: I643e2d96144210852fc8916ec9c483f2b207a48b
2022-01-24 19:38:06 +08:00
junyulai
b6c77f026f [MS67.1] Expose registerUsageCallback with template
Test: atest FrameworksNetTests
Bug: 204830222
Change-Id: I643e2d96144210852fc8916ec9c483f2b207a48b
2022-01-24 19:38:06 +08:00
Junyu Lai
0bb493e12e [MS58] Expose Apis which will be used by data migration utility
This includes:
1. NetworkIdentity
2. NetworkIdentitySet
3. NetworkStatsHistory

NetworkStatsCollection Apis will be exposed in a separate CL.

Test: TH
Bug: 204830222
Change-Id: I47b2d3ac3b86cb4e6879afaae34326ca3c050ffa
2022-01-24 15:44:27 +08:00
Junyu Lai
059f1403f6 [MS58] Expose Apis which will be used by data migration utility
This includes:
1. NetworkIdentity
2. NetworkIdentitySet
3. NetworkStatsHistory

NetworkStatsCollection Apis will be exposed in a separate CL.

Test: TH
Bug: 204830222
Change-Id: I47b2d3ac3b86cb4e6879afaae34326ca3c050ffa
2022-01-24 15:44:27 +08:00
Junyu Lai
3869785f9d Merge changes from topics "ms56-historybuilder", "ms65.3" am: 54bc16fc64 am: c12cb4a8d2 am: c8731ab38f am: a949e212c3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1951478

Change-Id: Ib37133be135675f5735c3ba85987f94e35a305b4
2022-01-24 06:25:34 +00:00
Xiao Ma
ed76c1b8ea Move Ethernet related files to f/b/packages/ConnectivityT.
ethernet-service is going to be moved into Connectivity mainline module.
Notice that below sources are also only used in the ethernet framework
during compiling the filegroup: framework-connectivity-ethernet-sources.
Move them from f/b to f/b/packages/ConnectivityT as well.

Ethernet framework only related files:
    - IInternalNetworkManagementListener.aidl
    - InternalNetworkManagementException.java
    - InternalNetworkManagementException.aidl
    - InternalNetworkUpdateRequest.java
    - InternalNetworkUpdateRequest.aidl

Ethernet service only related files:
    - DelayedDiskWrite.java(IpConfigStore imports this class)

Bug: 210586283
Test: build pass
      atest FrameworksNetTests
      atest EthernetServiceTests
Change-Id: I1ec2d1d182c04f3f2acc9b757d5061ca749a4a3c
2022-01-24 04:15:14 +00:00
Xiao Ma
e3da3eb78b Move Ethernet related files to f/b/packages/ConnectivityT.
ethernet-service is going to be moved into Connectivity mainline module.
Notice that below sources are also only used in the ethernet framework
during compiling the filegroup: framework-connectivity-ethernet-sources.
Move them from f/b to f/b/packages/ConnectivityT as well.

Ethernet framework only related files:
    - IInternalNetworkManagementListener.aidl
    - InternalNetworkManagementException.java
    - InternalNetworkManagementException.aidl
    - InternalNetworkUpdateRequest.java
    - InternalNetworkUpdateRequest.aidl

Ethernet service only related files:
    - DelayedDiskWrite.java(IpConfigStore imports this class)

Bug: 210586283
Test: build pass
      atest FrameworksNetTests
      atest EthernetServiceTests
Change-Id: I1ec2d1d182c04f3f2acc9b757d5061ca749a4a3c
2022-01-24 04:15:14 +00:00
Junyu Lai
c0d66230ea [MS56.1] Add NetworkStatsHistory#Builder
NetworkStatsHistory will need to be exposed and constructed
from the data migration tool in the follow-up changes.
Add a Builder class to prevent from exposing internal array
structures.

Test: atest NetworkStatsHistoryTest#testBuilder
Bug: 204830222
Change-Id: I5f8ea1c825d601de0aac8623034ef896999fc1a0
2022-01-23 16:47:44 +08:00
Junyu Lai
8f1767e17f [MS56.1] Add NetworkStatsHistory#Builder
NetworkStatsHistory will need to be exposed and constructed
from the data migration tool in the follow-up changes.
Add a Builder class to prevent from exposing internal array
structures.

Test: atest NetworkStatsHistoryTest#testBuilder
Bug: 204830222
Change-Id: I5f8ea1c825d601de0aac8623034ef896999fc1a0
2022-01-23 16:47:44 +08:00
Junyu Lai
4489b71b9a [MS65.3] Address comments at aosp/1954383
This change also remove dependencies from
NetworkPolicyManagerService.

Test: atest NetworkIdentityTest#testBuilder \
      NetworkPolicyManagerServiceTest
Bug: 204830222
Change-Id: Ib1ec1968746d88165cbf5421d4ba30a00f4b678f
2022-01-23 16:47:36 +08:00
Junyu Lai
f91e175f96 [MS65.3] Address comments at aosp/1954383
This change also remove dependencies from
NetworkPolicyManagerService.

Test: atest NetworkIdentityTest#testBuilder \
      NetworkPolicyManagerServiceTest
Bug: 204830222
Change-Id: Ib1ec1968746d88165cbf5421d4ba30a00f4b678f
2022-01-23 16:47:36 +08:00
Les Lee
525e7b96c7 Merge "wifi data usage: Update calling API name" 2022-01-22 16:06:58 +00:00
Les Lee
103f53789d wifi data usage: Update calling API name
Bug: 213387087
Test: atest -c FrameworksWifiApiTests
Test: atest -c NetworkPolicyManagerServiceTest
Merged-In: I02d7f57de1acfd7b03be0a3e1c957ec1e1c5b4d4
Change-Id: I02d7f57de1acfd7b03be0a3e1c957ec1e1c5b4d4
2022-01-23 00:06:00 +08:00
Les Lee
a30280568d wifi data usage: Update calling API name
Bug: 213387087
Test: atest -c FrameworksWifiApiTests
Test: atest -c NetworkPolicyManagerServiceTest
Merged-In: I02d7f57de1acfd7b03be0a3e1c957ec1e1c5b4d4
Change-Id: I02d7f57de1acfd7b03be0a3e1c957ec1e1c5b4d4
2022-01-23 00:06:00 +08:00
Junyu Lai
8efe3482f3 [MS61] Remove NetworkManagementSocketTagger#install dependency
Expose TrafficStats#attachSocketTagger and use it instead.

Test: atest TrafficStatsTest
Bug: 204830222
CTS-Coverage-Bug: 214979748
Change-Id: I1748d349b499053ad08bd62202325fa759ad8da5
2022-01-22 13:51:55 +08:00
Junyu Lai
8e58c82591 [MS61] Remove NetworkManagementSocketTagger#install dependency
Expose TrafficStats#attachSocketTagger and use it instead.

Test: atest TrafficStatsTest
Bug: 204830222
CTS-Coverage-Bug: 214979748
Change-Id: I1748d349b499053ad08bd62202325fa759ad8da5
2022-01-22 13:51:55 +08:00
Junyu Lai
485be2ee5b Merge "[MS66] Initialize TrafficStats with context" am: a411d32226 am: c77ec27366 am: 69eba2b797 am: 1685e52be5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956077

Change-Id: I5c1588157302b236ffa03329cde4f63277026bbf
2022-01-22 01:15:07 +00:00
Junyu Lai
6f39e805a1 [MS66] Initialize TrafficStats with context
TrafficStats has static methods created in API level 8 that need
access to NetworkStatsManager but doesn't take a context.
Previously this was achieved by using ServiceManager, but
with TrafficStats moving to the connectivity module, this
is no longer possible.

Instead, make sure TrafficStats has an appropriate context by
the time any client code can call the relevant methods.
• In app code, this achieved by passing the application
  context from ActivityThread#handleBindApplication, before any
  app code can run.
• In the system server, this is achieved by passing the context
  right after creating service.

Test: atest TrafficStatsTest CtsWebkitTestCases
Bug: 204830222

Change-Id: I251bb8a4431ad12ff61929879ef1363cf06b9244
2022-01-22 01:01:49 +08:00
Junyu Lai
92d5b4cbc2 [MS66] Initialize TrafficStats with context
TrafficStats has static methods created in API level 8 that need
access to NetworkStatsManager but doesn't take a context.
Previously this was achieved by using ServiceManager, but
with TrafficStats moving to the connectivity module, this
is no longer possible.

Instead, make sure TrafficStats has an appropriate context by
the time any client code can call the relevant methods.
• In app code, this achieved by passing the application
  context from ActivityThread#handleBindApplication, before any
  app code can run.
• In the system server, this is achieved by passing the context
  right after creating service.

Test: atest TrafficStatsTest CtsWebkitTestCases
Bug: 204830222

Change-Id: I251bb8a4431ad12ff61929879ef1363cf06b9244
2022-01-22 01:01:49 +08:00
Les Lee
909741d0c2 wifi data usage: Update calling API name
Bug: 213387087
Test: atest -c FrameworksWifiApiTests
Test: atest -c NetworkPolicyManagerServiceTest
Change-Id: I02d7f57de1acfd7b03be0a3e1c957ec1e1c5b4d4
Ignore-AOSP-First: Related API conflict in wifi module, need master first.
2022-01-21 22:38:02 +08:00
Junyu Lai
0a9f7cd59c Merge changes from topic "ms65-identity" am: 6dcaf9dee4 am: d027e6cd1c am: 7e7eb05e08 am: 7ed0072f07
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954383

Change-Id: Ib449635e1b121fde7c97f0d668b6f9ce92d8c3eb
2022-01-21 10:34:13 +00:00
Junyu Lai
6dcaf9dee4 Merge changes from topic "ms65-identity"
* changes:
  [MS65.1] Add NetworkIdentity#Builder
  [MS46] Remove INetworkStatsSession usage from NetworkCycleDataLoader
2022-01-21 09:36:08 +00:00
Junyu Lai
8ab6b706c0 Merge changes from topic "ms65-identity"
* changes:
  [MS65.1] Add NetworkIdentity#Builder
  [MS46] Remove INetworkStatsSession usage from NetworkCycleDataLoader
2022-01-21 09:36:08 +00:00
Frank Li
7602118dd9 Merge "[DU03-1]Remove INetworkStatsService from BatteryStatsImpl" am: acd0aef603 am: 18bf9f8d10 am: df8a07ce41 am: 85d620386f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1948496

Change-Id: Ie58903de1d88367bced48dd4e79c51cfd49701b8
2022-01-21 09:12:55 +00:00
lifr
02eb422cb4 [DU03-1]Remove INetworkStatsService from BatteryStatsImpl
Expose systemapi NetworkStats.getDetailedUidStats for use by
BatteryStats.

BatteryStatsImpl is using INetworkStatsService APIs, which
cannot be accessed after moving into the mainline module. So, replace
and remove those hidden API usages.

Bug: 210066922
Test: atest BatteryStatsImplTest WifiPowerCalculatorTest
            MobileRadioPowerCalculatorTest NetworkStatsServiceTest
CTS-Coverage-Bug: 213437796
Change-Id: I40d713923278f4654d67bb4d12155cea85c10447
2022-01-21 13:52:41 +08:00
lifr
2b7135e794 [DU03-1]Remove INetworkStatsService from BatteryStatsImpl
Expose systemapi NetworkStats.getDetailedUidStats for use by
BatteryStats.

BatteryStatsImpl is using INetworkStatsService APIs, which
cannot be accessed after moving into the mainline module. So, replace
and remove those hidden API usages.

Bug: 210066922
Test: atest BatteryStatsImplTest WifiPowerCalculatorTest
            MobileRadioPowerCalculatorTest NetworkStatsServiceTest
CTS-Coverage-Bug: 213437796
Change-Id: I40d713923278f4654d67bb4d12155cea85c10447
2022-01-21 13:52:41 +08:00
Junyu Lai
9421920ef0 Merge changes from topic "ms57-migrationapi" am: 717c22831a am: 7b8b30b556 am: d2e67b90c6 am: c649f6854b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1951477

Change-Id: I4d3e51cc7c2c9ab4ae85a5e03839219b73df2525
2022-01-21 05:39:15 +00:00
Junyu Lai
294c24e2e9 [MS45] Expose SystemApis to query summary and history with template am: 84316eb4b6 am: 0ac2f83852 am: 7805221bdc am: 3cee4edd39
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1940846

Change-Id: I934147935aeca34518e09ab9a2771efd0da18cb2
2022-01-21 05:39:02 +00:00
Junyu Lai
91a7775370 Merge "[MS41.1] Prepare for APIs for querying usage with template" am: 22c1481659 am: 39f1142822 am: b8e7864780 am: 3474702f29
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1937268

Change-Id: Ib7f1fab00d0e626d90748a3246e6cdce487d1e79
2022-01-21 01:37:52 +00:00