summaryrefslogtreecommitdiff
path: root/framework-t/src/android/net/NetworkTemplate.java
Commit message (Collapse)AuthorAgeFilesLines
* Fix NetworkTemplate generates non-metered carrier templateJunyu Lai2022-04-181-2/+3
| | | | | | | | | | | | | | | | | From current design, NetworkPolicyManagerService should only creates metered carrier/mobile templates. However, if someone calls the hidden API interface or the template was created before NetworkTemplate#Builder is published. The caller may create a non-metered carrier template and persist into the storage. This CL elimates this possibility and mark non-metered carrier template non-persistable, so devices could auto-recover from this symptom after reboot. Fix: 222382637 Test: TH Change-Id: I5265e371b0126ce65c32fb09a6e04223afb3d286
* 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
* [DU12]Remove NetworkType AnnotationFrank2022-01-271-3/+2
| | | | | | | Bug: 216619447 Test: atest NetworkTemplateTest NetworkStatsCollectionTest NetworkStatsSubscriptionsMonitorTest Change-Id: I58689201a684f581a4b88df058a5e0683da61926
* Move the implement of getAllCollapsedRatTypes to StatsPullAtomServiceAaron Huang2022-01-271-84/+2
| | | | | | | | | | | 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-271-14/+8
| | | | | | | | | 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
* [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
* wifi data usage: Update calling API nameLes Lee2022-01-231-6/+6
| | | | | | | | Bug: 213387087 Test: atest -c FrameworksWifiApiTests Test: atest -c NetworkPolicyManagerServiceTest Merged-In: I02d7f57de1acfd7b03be0a3e1c957ec1e1c5b4d4 Change-Id: I02d7f57de1acfd7b03be0a3e1c957ec1e1c5b4d4
* [MS57.1] Prepare APIs for data migration utilityJunyu Lai2022-01-201-15/+15
| | | | | | | | | | | | | | This includes: 1. Move PREFIX_* constants to NetworkStatsManager to expose in later changes. 2. Rename networkId to wifiNetworkKey. 3. Rename subType to ratType. 4. Replace SUBTYPE_COMBINED with NETWORK_TYPE_ALL 5. Fix lint errors when exposing system api. Test: TH Bug: 204830222 Change-Id: I2b7c34958bc59c3225c96f12abba008b83101585
* [MS09] Expose NetworkTemplate APIs which are needed by NetworkPolicyJunyu Lai2022-01-061-13/+10
| | | | | | | | | This change also remove getWifiNetworkKey which should not be exposed as system API. Test: atest NetworkTemplateTest Bug: 204830222 Change-Id: I924f62025a8672167f778ff790cd208c74eed878
* wifi data usage: replaced Wi-Fi SSID with a Wi-Fi network keyLes Lee2022-01-031-67/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Used SSID to be a wifi network identity can't separate wifi data usage when there are two different network with same SSID. Use a new usage key from WifiInfo to replace wifi SSID to solve this issue. 2. To support to query wifi usage per configured Wifi network. Adding matchWifiNetworkKeys in NetworkTemplate to support querying multi networkKeys wifi data usage since each configured Wifi network configuration might be used to connect different Wifi network. (Replace mNetworkId with mMatchWifiNetworkKeys) 3. Updated callers who were using NetworkTemplate constructor. 4. Fixed SortedSet null order case. The null subscriberId is a valid input for matchSubscriberIds. 5. Replaced ArrayUtils with CollectionUtils. Bug: 197520752 Bug: 126299427 Test: atest -c NetworkTemplateTest Test: atest -c NetworkStatsServiceTest Test: atest -c NetworkPolicyManagerServiceTest Test: atest -c NetworkPolicyTest Change-Id: Ie20e7fb56597817901be4ce1d2a7afcbc9ded0c6
* [MS15.1] Remove get/setSubscriberIdMatchRule dependenciesJunyu Lai2021-12-221-42/+15
| | | | | | | | | | | | | | Subscriber Id Match Rule won't be exposed as system Api. Callers should use Builder#setSubscriberIds or NetworkTemplate#getSubscriberIds to set/get the Subscriber Ids filter. An empty set in the paremter or return value represents the intention of matching any Subscriber Ids. Test: atest NetworkPolicyManagerServiceTest \ FrameworksNetTests Bug: 204830222 Change-Id: I12c54280b44c71e4737e82859dfe869794cc9c29
* [MS14] Move isPersistable to NetworkPolicyJunyu Lai2021-12-211-24/+0
| | | | | | | | | | Since the NetworkTemplate serialization is done in the platform code. To decide whether the template is persistable should be also inside the platform along with the serialization logic. Test: atest NetworkPolicyTest Bug: 204830222 Change-Id: I15d17dda77e6a3e1ae11275915e3d2f6e2888639
* [MS12.1] Support NetworkTemplate builderJunyu Lai2021-12-211-15/+275
| | | | | | | | | | | | | | | | | | | | In current design, NeworkTemplate has a lot of buildTemplate* functions to create various type of templates. These functions do not have any flexibility to add any dimension. Thus, if there is a need to add a dimension, the typical ways are: 1. Add one parameter to the buildTemplate* function and change all callers. 2. Use the NetworkTemplate constructors directly. And add one more parameter if it doesn't fulfill the needs. These codes are painful to maintain in the future if they are exposed as system api since they are lack of flexibility. Thus, introduce a builder class to NetworkTemplate to address this problem. Test: atest NetworkTemplateTest Bug: 204830222 Change-Id: I49fab236bac392563b1290d69573ad1415fda734
* [MS05] Fix NetworkTemplate lint errorsJunyu Lai2021-12-201-9/+127
| | | | | | | | | This change also defines some IntDef annotations that will be used in the follow-up CLs. Test: TH Bug: 204830222 Change-Id: Iba5e714a1304fdfd154379415dcc5d0f9b7b1b29
* [MS01] Move NetworkTemplate cloud backup functions to NetworkPolicyJunyu Lai2021-12-101-73/+0
| | | | | | | | | | | | | | Since NetworkTemplate will be moved into the mainline module. It is necessary to remove hidden BackupUtil usage from NetworkTemplate. Also, it is also a hazard to maintain compatibility for byte buffer interfaces. Thus, move out these cloud backup functions to NetworkPolicy to address these concerns. Test: atest NetworkPolicyTest NetworkPolicyManagerServiceTest Bug: 204830222 Change-Id: I3ec55f7e419ea13db535acff2457d8e7aaebdce8
* [MS08] Move NetworkStats files to f/b/package/ConnectivityTJunyu Lai2021-12-101-0/+906
NetworkStatsService is going to be moved into ConnectivityService module. Move all related files to packages/ConnectivityT so that it can be easily migrate these files to connectivity module after clearing the hidden API usages. Bug: 197717846 Test: TH Change-Id: Iead00832b5eb7b1dc40a92027c5a14ae8316b16c