summaryrefslogtreecommitdiff
path: root/framework-t/src
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | Allowing for null net caps in updateConfigurationJames Mattis2022-03-081-17/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Marking NetworkCapabilities as nullable in updateConfiguration and updating where needed to support this. This will allow callers of the ethernet network management updateConfiguration API to use it primarily for setting an ethernet network's IP configuration. Bug: 222565654 Bug: 220017952 Bug: 210485380 Test: atest EthernetNetworkUpdateRequestTest Change-Id: I1f80e950acbd078a6b3378e1fa5f1e4173112e79
| * | | Merge "[MS68.3] Address comments at aosp/1958144"Frank Li2022-03-031-2/+6
| |\ \ \ | | |/ / | |/| |
| | * | [MS68.3] Address comments at aosp/1958144Frank2022-03-021-2/+6
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: atest TrafficStatsTest NetworkUsageStatsTest FrameworksNetTests Bug: 204830222 (cherry-picked from ag/16813003) Change-Id: I5a54b44294021d64d8506eeb570db0db8544472a Merged-In: I5a54b44294021d64d8506eeb570db0db8544472a
| * | Merge "[SUBID01-0]Grow NetworkIdentity to include a new mSubId field"Frank Li2022-03-023-8/+66
| |\ \
| | * | [SUBID01-0]Grow NetworkIdentity to include a new mSubId fieldlifr2022-03-023-8/+66
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the previous design of NSS and NPMS, those only had IMSI to identify the cell network. Now the telephony has created the "subId" handle, which is the preferred mechanism for identifying subscribers. This commit adds NetworkStats support for subscriberId as a part of the network identity key Bug: 80526261 Test: atest NetworkTemplateTest NetworkStatsCollectionTest NetworkStatsServiceTest NetworkIdentityTest NetworkStatsDataMigrationUtilsTest (cherry-picked from ag/16825721) Change-Id: Ie1fe81006555dbcca4b62457fa6c319f04b4576d Merged-In: Ie1fe81006555dbcca4b62457fa6c319f04b4576d
| * / [DU03-4]Add NETWORK_STACK Permission check for NetworkStatsService APIFrank2022-03-021-2/+6
| |/ | | | | | | | | | | | | | | | | | | | | | | | | 1. getUidStatsForTransport API Bug: 210066922 Test: atest BatteryStatsImplTest WifiPowerCalculatorTest MobileRadioPowerCalculatorTest NetworkStatsServiceTest (cherry-picked from ag/16816095) Change-Id: I022c34b5af87fe3ff6857ea264bac2f7098eaed4 Merged-In: I022c34b5af87fe3ff6857ea264bac2f7098eaed4
| * Merge "Updating Eth Update Request to use Builder"James Mattis2022-02-281-7/+63
| |\
| | * Updating Eth Update Request to use BuilderJames Mattis2022-02-241-7/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updating EthernetNetworkUpdateRequest to use a builder for creation and also changing to use IpConfiguration instead of StaticIpConfiguration. Bug: 220017952 Bug: 210487893 Bug: 210485380 Test: atest EthernetServiceTests Change-Id: I78b002c12cf927c075671b75f0fe0d7878443b56
| * | Merge changes from topic "ms52-movenetstats"Lorenzo Colitti2022-02-287-29/+44
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | * changes: Expose MATCH_PROXY as a module-lib API. Add setPollForce to module API Move networkstats JNI to connectivity module [MS54.1] Move NetworkStats to updatable sources [MS62.1] Start NetworkStatsService from the module
| | * Expose MATCH_PROXY as a module-lib API.Lorenzo Colitti2022-02-181-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | It is used by clockwork. Test: m update-api (cherry-picked from ag/16786203) Change-Id: I5676f883141afca1511c425b7c36683a6c6bfb9f Merged-In: I5676f883141afca1511c425b7c36683a6c6bfb9f
| | * Add setPollForce to module APIRemi NGUYEN VAN2022-02-181-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The API was test API in S, but this is not supported in module API surfaces. Make it module API instead. Bug: 197717846 Test: Tests already using this API (cherry-picked from ag/16780943) Change-Id: I9d44b761572f94b08b269478c4a0c20c1171343c Merged-In: I9d44b761572f94b08b269478c4a0c20c1171343c
| | * [MS54.1] Move NetworkStats to updatable sourcesJunyu Lai2022-02-184-22/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL builds NetworkStats related code with the connectivity module instead of platform. This includes: 1. Add netstats.proto to the module. 2. Add lib dependencies for all callers. 3. Include several source files in platform and add jarjar rule to it. Modify callers accordingly. Test: TH Bug: 197717846 Change-Id: I244693aebe1782d9e67502638ff8145c51462e1e Merged-In: I244693aebe1782d9e67502638ff8145c51462e1e
| | * [MS62.1] Start NetworkStatsService from the moduleJunyu Lai2022-02-181-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NetworkStatsService is going to be moved into Connectivity mainlne module and it will be not visible to SystemServiceResistry after migration done. Thus: 1. Register service in NetworkStatsServiceInitialalizer, a separate initializer is needed because the service needs to be created before NetworkPolicyManagerService's initialization. 2. Call SystemReady at PHASE_ACTIVITY_MANAGER_READY phase where it needs to be ready before StatsPullAtomService pulls at PHASE_THIRD_PARTY_APPS_CAN_START. 3. Register manager in ConnectivityFrameworkInitializerTiramisu instead of SystemServiceRegistery. Test: atest FrameworksNetTests CtsNetTestCases NetworkUsageStatsTest Bug: 204830222 (cherry-picked from ag/16688794) Change-Id: I95020d816ed613ce3480a0720a5b71dcdc7fab72 Merged-In: I95020d816ed613ce3480a0720a5b71dcdc7fab72
| * | Merge "Check iface by TextUtils.equals"Aaron Huang2022-02-221-1/+2
| |\ \ | | |/ | |/|
| | * Check iface by TextUtils.equalsAaron Huang2022-01-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In current equals method, if iface is null then it will cause null object reference when checking iface. Thus, use TextUtils.equals to check iface so that it can compare null iface. Bug: 210073043 Test: FrameworksNetTests, NetworkStaticLibTests Change-Id: I2bd8127cb030ea54438382ee89961590fffbc31a
| * | Fix grammar nit in comment.Lorenzo Colitti2022-02-111-1/+1
| | | | | | | | | | | | | | | Test: None Change-Id: I60cb2478615efce13f1904092abe5c21bdf0dc9a
| * | Expose EthernetManager state and control APIs.Xiao Ma2022-02-112-18/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL exposes EthernetManager APIs that settings and other system components can use to modify and monitor Ethernet state. The new APIs are similar to the existing @hide methods but pass on more information and meet API guidelines: 1. Add an InterfaceStateListener interface, and addInterfaceStateListener and removeInterfaceStateListener methods that meet API guidelines (e.g., take Executor, take SAM parameter last, etc.) This new listener passes interface state (absent, up, down), role (client or server) and IP configuration. 2. Implement the legacy Listener type as a subinterface of the new interface. Hopefully existing callers should be able to use it unchanged. 3. Expose setIncludeTestInterfaces as module-lib api instead of TestApi, since modules cannot expose TestApi methods. Bug: 210586283 Test: m Test: atest EthernetServiceTests Test: atest EthernetTetheringTest Change-Id: I88240a546ab51d128ed83775499f2bcabab74db0 Merged-In: I88240a546ab51d128ed83775499f2bcabab74db0
| * | Making EthernetNetworkSpecifier publicJames Mattis2022-02-101-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 210485380 Test: atest EthernetServiceTests atest CtsNetTestCasesLatestSdk Change-Id: Ic0b7a3360745632eb024a97692e49f6c8dafa3ee Merged-In: Ic0b7a3360745632eb024a97692e49f6c8dafa3ee
| * | Split out the ipsec API surface and use framework-connectivity-tiramisuAaron Huang2022-02-101-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 1dad7aa006492035293e68080aeaf606df02618a) Bug: 204153604 Test: TH Change-Id: I6cc8aef6a0ab9ce4bcef2797196b1d1b3687acca Merged-In: I6cc8aef6a0ab9ce4bcef2797196b1d1b3687acca
| * | Un-finalize IpSecManagerYan Yan2022-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows VCN and IKE unit tests to mock IpSecManager and thus stop depending on the hidden APIs in the Connectivity module (e.g. IpSecService binder interface). Otherwise, any changes on these related hidden APIs will require topic changes across multiple projects. Bug: 217572993 Test: make update-api Test: atest IpSecManagerTest, IpSecManagerTunnelTest Change-Id: I29f3ac96f83b4271f29a7051d33ccf47a0dd6c57 Merged-In: I29f3ac96f83b4271f29a7051d33ccf47a0dd6c57
| * | Marking eth network management APIs @SystemApiJames Mattis2022-02-043-7/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Annotating ethernet network management APIs in EthernetManager with @SystemApi. Bug: 210485380 Test: atest EthernetServiceTests atest CtsNetTestCasesLatestSdk Change-Id: I10429441fd4d7b9bcaa7437b844420a43a415d72 Merged-In: I10429441fd4d7b9bcaa7437b844420a43a415d72
| * | Merge "Adding permission for Ethernet Network Management"James Mattis2022-02-041-0/+3
| |\ \
| | * | Adding permission for Ethernet Network ManagementJames Mattis2022-02-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding MANAGE_ETHERNET_NETWORKS as a signature level permission to allow an application to dynamically change ethernet network values. Bug: 210485380 Test: atest EthernetServiceTests Change-Id: Icf9c2accc86735cc981adc0d5a24802e0616ffaf Merged-In: Icf9c2accc86735cc981adc0d5a24802e0616ffaf
| * | | Merge "Support discovering services with a NetworkRequest"Remi NGUYEN VAN2022-02-041-1/+248
| |\ \ \
| | * | | Support discovering services with a NetworkRequestRemi NGUYEN VAN2022-02-031-1/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A common mistake when using service discovery is to mismanage networks, expecting to find or be able to access services on networks that may not be available yet, or may be stale/lost. This new API allows clients to start service discovery with just a NetworkRequest, letting NsdManager track networks and notify when services are found/lost for each network. Bug: 190249673 Test: atest NsdManagerTest Change-Id: I12e799aa48fce2d1a35f708c5617386b1cc70f21
| * | | | Merge changes from topic "nsd_serviceinfo_network"Remi NGUYEN VAN2022-02-042-7/+48
| |\| | | | | |/ / | |/| | | | | | | | | | | | | | * changes: Support discover/resolve on specific networks NSD: Specify on what interface to getAddrInfo
| | * | Support discover/resolve on specific networksRemi NGUYEN VAN2022-02-032-7/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a Network member to NsdServiceInfo, allowing discovered services to report which network they were discovered on, and clients to specify which network to resolve the service on. If clients use the discovered NsdServiceInfo to resolve a service, it will be resolved on the network where it was discovered instead of an unspecified network. Also add a network parameter to a new overload of NsdManager#discoverServices, so that clients can discover on specific networks. Bug: 190249673 Test: atest NsdManagerTest Change-Id: Idc4bf9fde0f4b0328204a8cd2eedc12fffbbbdba
| * | | Renaming Ethernet Network Management ClassesJames Mattis2022-02-017-37/+62
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Renaming InternalNetwork* files and classes related to ethernet network management to EthernetNetwork* as ethernet is the only trasnport these particular files are used with. Bug: 210485380 Test: atest EthernetServiceTests Change-Id: Ieb3915c032ef5fcd6b36eb09878119de7668bb4b
| * | InternalNetworkManagementException ChangesJames Mattis2022-02-011-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | Update to InternalNetworkManagementException in order to allow all members to be parcelable. Bug: 210485380 Test: atest EthernetServiceTests Change-Id: I17f119a66face8a927546657490969aa3073c54b
| * | Merge changes from topics "move-kerneltotag", "move-socket-tagging-to-mainline"Lorenzo Colitti2022-01-311-12/+74
| |\ \ | | | | | | | | | | | | | | | | | | | | * changes: Move socket tagging implementation to mainline. Move kernelToTag to NetworkStatsFactory.
| | * | Move socket tagging implementation to mainline.Lorenzo Colitti2022-01-301-12/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, socket tagging is implemented in the framework. The Java code is in NetworkManagmentSocketTagger.java and the JNI is in libandroid and loaded by the general framework JNI loader. - Move the Java implementation to TrafficStats, which is the only caller of NetworkManagmentSocketTagger. This simplifies the code a bit because a number of methods can be deleted. - Move the JNI code to a new JNI library in the APEX. The library depends only on the NDK and statically links the NDK-only version of libnativehelper. Its size is only 5k on ARM and 10k on ARM64. - Temporarily make the framework depend on this library until the rest of the T connectivity code moves to the APEX. Test: atest NetworkUsageStatsTest CtsNetTestCases:TrafficStatsTest Change-Id: I050c7c515237f68b78d08987bc443f50a7949c06
| * | | [MS59.3] Expose NetworkStatsDataMigrationUtilsjunyulai2022-01-281-8/+4
| |/ / | | | | | | | | | | | | | | | Test: TH Bug: 204830222 Change-Id: I15a45fbadeb69b70a0e983b00de9e934d29749d6
| * | [DU12]Remove NetworkType AnnotationFrank2022-01-272-7/+4
| | | | | | | | | | | | | | | | | | | | | Bug: 216619447 Test: atest NetworkTemplateTest NetworkStatsCollectionTest NetworkStatsSubscriptionsMonitorTest Change-Id: I58689201a684f581a4b88df058a5e0683da61926
| * | Move the implement of getAllCollapsedRatTypes to StatsPullAtomServiceAaron Huang2022-01-272-84/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Move NETWORK_TYPE_5G_NSA from NetworkTemplate to NetworkStatsManagerAaron Huang2022-01-273-15/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge "Use public resouce in android.R package"Aaron Huang2022-01-261-1/+1
| |\ \
| | * | Use public resouce in android.R packageAaron Huang2022-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use public resource since IpSec is planed to be moved into Connectivity mainline module. Bug: 204153604 Test: build Change-Id: I0aafef6b9b08307c3aebce597a2dd24925c6b09a Merged-In: I0aafef6b9b08307c3aebce597a2dd24925c6b09a
| * | | Merge "[MS74] Expose NetworkTemplate#matches"Treehugger Robot2022-01-261-1/+3
| |\ \ \
| | * | | [MS74] Expose NetworkTemplate#matchesjunyulai2022-01-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is used by NetworkPolicyManagerService to find relevant networks of a given NetworkPolicy. Test: TH Bug: 204830222 Change-Id: I7176ab727bf208e0fd05ecb9c2bcb00cd3438031
| * | | | [MS78.1] Fix NetworkIdentity#Builder crashing on 5G NSA networksJunyu Lai2022-01-261-1/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | Test: atest NetworkIdentityTest Fix: 216193400 Change-Id: Iaeae0c66f222ae8730439c5aedf5d5818855875d
| * | | Merge "[DU09-0]Adding the NetworkStatsCollection Builder"Junyu Lai2022-01-251-1/+71
| |\ \ \
| | * | | [DU09-0]Adding the NetworkStatsCollection BuilderFrank2022-01-251-1/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The purpose is provide NetworkStatsCollection.Builder as public API for adding the stats {@link NetworkStatsHistory} Bug: 215862801 Test: atest NetworkStatsCollectionTest Change-Id: I65ad589473cbb7785cbe8297f793ce9f18a55c35
| * | | | Merge "[MS69.1] Fix TrafficStats.init crashs for supplemental process"Junyu Lai2022-01-251-0/+8
| |\ \ \ \
| | * | | | [MS69.1] Fix TrafficStats.init crashs for supplemental processJunyu Lai2022-01-251-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Merge "[MS68.1] Register usage callback from NetworkPolicyManagerService"Junyu Lai2022-01-251-1/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | [MS68.1] Register usage callback from NetworkPolicyManagerServicejunyulai2022-01-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use usage callback to replace the need of intent receiver. Test: atest TrafficStatsTest NetworkUsageStatsTest FrameworksNetTests Bug: 204830222 Change-Id: I40967c2b6c86d25c7db93e6d3a4908b72ed76154
| * | | | | Merge "[MS67.1] Expose registerUsageCallback with template"Junyu Lai2022-01-253-54/+123
| |\| | | |
| | * | | | [MS67.1] Expose registerUsageCallback with templatejunyulai2022-01-243-54/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: atest FrameworksNetTests Bug: 204830222 Change-Id: I643e2d96144210852fc8916ec9c483f2b207a48b
| * | | | | Merge "[MS61] Remove NetworkManagementSocketTagger#install dependency"Junyu Lai2022-01-251-0/+14
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | [MS61] Remove NetworkManagementSocketTagger#install dependencyJunyu Lai2022-01-221-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose TrafficStats#attachSocketTagger and use it instead. Test: atest TrafficStatsTest Bug: 204830222 CTS-Coverage-Bug: 214979748 Change-Id: I1748d349b499053ad08bd62202325fa759ad8da5