Commit Graph

478 Commits

Author SHA1 Message Date
Frank
de9b4def5f [DU12]Remove NetworkType Annotation
Bug: 216619447
Test: atest NetworkTemplateTest NetworkStatsCollectionTest
            NetworkStatsSubscriptionsMonitorTest
Change-Id: I58689201a684f581a4b88df058a5e0683da61926
2022-01-27 22:28:20 +08:00
Frank
a522e3ddd1 [DU12]Remove NetworkType Annotation
Bug: 216619447
Test: atest NetworkTemplateTest NetworkStatsCollectionTest
            NetworkStatsSubscriptionsMonitorTest
Change-Id: I58689201a684f581a4b88df058a5e0683da61926
2022-01-27 22:28:20 +08:00
Aaron Huang
e1d6dd86bc Merge "Move the implement of getAllCollapsedRatTypes to StatsPullAtomService" am: e48ca58c47 am: b40701ed97 am: c4e0256170 am: 224765ee63
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960191

Change-Id: Ic11bb6f312b1d8296b57e8cf5ebd6c04bdaac0f6
2022-01-27 09:30:26 +00:00
Aaron Huang
4cef553adb Merge "Move NETWORK_TYPE_5G_NSA from NetworkTemplate to NetworkStatsManager" am: 75ed57cd6a am: b679307a1c am: de1b970194 am: 788636b582
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960190

Change-Id: I29e941b328b84986e1ef4a9fcfcce932c86ce69a
2022-01-27 09:29:49 +00:00
Aaron Huang
1618171b38 Move the implement of getAllCollapsedRatTypes to StatsPullAtomService
To make data usage as a mainline module, move getAllCollapsedRatTypes
to StatsPullAtomService since currently it is the only user. Also, the
method needs to call getCollapsedRatType, thus move getCollapsedRatType
to NetworkStatsManager and expose it as module API.

Bug: 210073043
Test: builds, FrameworksNetTests
Change-Id: Ibe41b50f173464694c21dd22841552bdb69a6a14
2022-01-27 12:27:20 +08:00
Aaron Huang
8117e4bbfb Move the implement of getAllCollapsedRatTypes to StatsPullAtomService
To make data usage as a mainline module, move getAllCollapsedRatTypes
to StatsPullAtomService since currently it is the only user. Also, the
method needs to call getCollapsedRatType, thus move getCollapsedRatType
to NetworkStatsManager and expose it as module API.

Bug: 210073043
Test: builds, FrameworksNetTests
Change-Id: Ibe41b50f173464694c21dd22841552bdb69a6a14
2022-01-27 12:27:20 +08:00
Aaron Huang
0bfd365a4f Move NETWORK_TYPE_5G_NSA from NetworkTemplate to NetworkStatsManager
Move NETWORK_TYPE_5G_NSA to NetworkStatsManager. Also expose it as
module API so that it can be used out of module.

Bug: 210073043
Test: builds, FrameworksNetTests
Change-Id: I670c7e1405107bbe30b92fe1a8d81652c46de6d9
2022-01-27 12:23:56 +08:00
Aaron Huang
7a41918fa5 Move NETWORK_TYPE_5G_NSA from NetworkTemplate to NetworkStatsManager
Move NETWORK_TYPE_5G_NSA to NetworkStatsManager. Also expose it as
module API so that it can be used out of module.

Bug: 210073043
Test: builds, FrameworksNetTests
Change-Id: I670c7e1405107bbe30b92fe1a8d81652c46de6d9
2022-01-27 12:23:56 +08:00
Aaron Huang
17a9e07870 Merge "Use public resouce in android.R package" 2022-01-26 15:01:32 +00:00
Aaron Huang
e065c41cdf Merge "Use public resouce in android.R package" 2022-01-26 15:01:32 +00:00
Treehugger Robot
09b7c0ae16 Merge "[MS74] Expose NetworkTemplate#matches" am: 4f6a232bb4 am: 946b17a690 am: c0fc627917 am: d596b16156
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960186

Change-Id: Id1d9b54c7e359f893c3f155760a4b750a704e224
2022-01-26 12:40:36 +00:00
Treehugger Robot
4f6a232bb4 Merge "[MS74] Expose NetworkTemplate#matches" 2022-01-26 11:33:29 +00:00
Treehugger Robot
2e88e9aac7 Merge "[MS74] Expose NetworkTemplate#matches" 2022-01-26 11:33:29 +00:00
Treehugger Robot
9f9c02a359 Merge "[MS78.1] Fix NetworkIdentity#Builder crashing on 5G NSA networks" am: e73b1c2270 am: dfc48164f3 am: a088975530 am: 3aed030c7e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958896

Change-Id: Ib3df7b938ec24b07e9fc6649ab13c3035b1f5cba
2022-01-26 11:25:50 +00:00
Junyu Lai
ce3dbdb741 [MS78.1] Fix NetworkIdentity#Builder crashing on 5G NSA networks
Test: atest NetworkIdentityTest
Fix: 216193400
Change-Id: Iaeae0c66f222ae8730439c5aedf5d5818855875d
2022-01-26 07:35:47 +00:00
Junyu Lai
9a61a18103 [MS78.1] Fix NetworkIdentity#Builder crashing on 5G NSA networks
Test: atest NetworkIdentityTest
Fix: 216193400
Change-Id: Iaeae0c66f222ae8730439c5aedf5d5818855875d
2022-01-26 07:35:47 +00:00
Junyu Lai
350eca2910 Merge "[DU09-0]Adding the NetworkStatsCollection Builder" am: b6ac084831 am: a6c7dd6df0 am: 41e14bee2e am: d72265b4e1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956982

Change-Id: I037367b61971930d397eeb1044c8dbb5087f07e4
2022-01-25 17:43:24 +00:00
Junyu Lai
770bdc232b Merge "[MS69.1] Fix TrafficStats.init crashs for supplemental process" am: a6889ec04f am: 498a92aac8 am: e1bf1d894d am: c1878210d1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959129

Change-Id: I965b8795a738419d2f9e3759f04d29d3e64174ca
2022-01-25 17:41:05 +00:00
junyulai
ad252f8347 [MS74] Expose NetworkTemplate#matches
This is used by NetworkPolicyManagerService to find
relevant networks of a given NetworkPolicy.

Test: TH
Bug: 204830222
Change-Id: I7176ab727bf208e0fd05ecb9c2bcb00cd3438031
2022-01-26 01:38:44 +08:00
junyulai
a47e4001ac [MS74] Expose NetworkTemplate#matches
This is used by NetworkPolicyManagerService to find
relevant networks of a given NetworkPolicy.

Test: TH
Bug: 204830222
Change-Id: I7176ab727bf208e0fd05ecb9c2bcb00cd3438031
2022-01-26 01:38:44 +08:00
Junyu Lai
b6ac084831 Merge "[DU09-0]Adding the NetworkStatsCollection Builder" 2022-01-25 16:44:16 +00:00
Junyu Lai
fd58681122 Merge "[DU09-0]Adding the NetworkStatsCollection Builder" 2022-01-25 16:44:16 +00:00
Junyu Lai
a6889ec04f Merge "[MS69.1] Fix TrafficStats.init crashs for supplemental process" 2022-01-25 16:26:34 +00:00
Junyu Lai
ce9178e863 Merge "[MS69.1] Fix TrafficStats.init crashs for supplemental process" 2022-01-25 16:26:34 +00:00
Junyu Lai
d0437973a6 Merge "[MS68.1] Register usage callback from NetworkPolicyManagerService" am: 0534b453bc am: 4531d6630b am: 1fa0cb1ed0 am: 2ab01da081
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958144

Change-Id: I88866a6211c5105d23123757d505011dcab29d3d
2022-01-25 14:44:27 +00:00
Junyu Lai
0534b453bc Merge "[MS68.1] Register usage callback from NetworkPolicyManagerService" 2022-01-25 13:30:57 +00:00
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