summaryrefslogtreecommitdiff
path: root/framework-t/src/android/net/NetworkIdentity.java
Commit message (Collapse)AuthorAgeFilesLines
* Fix proto invalid write typeAaron Huang2022-03-041-5/+5
| | | | | | | | | | | | | | | | | | | While dumpProtoLocked is called, InvalidProtocolBufferException occurred because types are mismatched between platform side and module side. netstats.proto was moved into connectivity module, both the platform(incident.proto) and the module uses protoc-gen-javastream to generate the Java classes from it. It should be fine since platform includes the source of the proto, and jarjar the generated classess in the module to avoid conflict with platform. Bug: 218566849 Test: adb shell incident 3001 adb shell dumpsys netstats --proto atest CtsIncidentHostTestCases:IncidentdTest#testIncidentReportDumpAuto Change-Id: I4654350a59dc1ca1a925785ad37f34aa7b481235 Merged-In: I4654350a59dc1ca1a925785ad37f34aa7b481235
* [SUBID01-0]Grow NetworkIdentity to include a new mSubId fieldlifr2022-02-101-5/+34
| | | | | | | | | | | | | | | 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 Change-Id: Ie1fe81006555dbcca4b62457fa6c319f04b4576d
* [MS54.1] Move NetworkStats to updatable sourcesJunyu Lai2022-02-071-5/+5
| | | | | | | | | | | | | | | 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
* [DU12]Remove NetworkType AnnotationFrank2022-01-271-4/+2
| | | | | | | Bug: 216619447 Test: atest NetworkTemplateTest NetworkStatsCollectionTest NetworkStatsSubscriptionsMonitorTest Change-Id: I58689201a684f581a4b88df058a5e0683da61926
* Move NETWORK_TYPE_5G_NSA from NetworkTemplate to NetworkStatsManagerAaron Huang2022-01-271-1/+2
| | | | | | | | | 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
* [MS78.1] Fix NetworkIdentity#Builder crashing on 5G NSA networksJunyu Lai2022-01-261-1/+2
| | | | | | Test: atest NetworkIdentityTest Fix: 216193400 Change-Id: Iaeae0c66f222ae8730439c5aedf5d5818855875d
* [MS58] Expose Apis which will be used by data migration utilityJunyu Lai2022-01-241-16/+33
| | | | | | | | | | | | | This includes: 1. NetworkIdentity 2. NetworkIdentitySet 3. NetworkStatsHistory NetworkStatsCollection Apis will be exposed in a separate CL. Test: TH Bug: 204830222 Change-Id: I47b2d3ac3b86cb4e6879afaae34326ca3c050ffa
* [MS65.3] Address comments at aosp/1954383Junyu Lai2022-01-231-15/+54
| | | | | | | | | | This change also remove dependencies from NetworkPolicyManagerService. Test: atest NetworkIdentityTest#testBuilder \ NetworkPolicyManagerServiceTest Bug: 204830222 Change-Id: Ib1ec1968746d88165cbf5421d4ba30a00f4b678f
* wifi data usage: Update calling API nameLes Lee2022-01-231-3/+3
| | | | | | | | Bug: 213387087 Test: atest -c FrameworksWifiApiTests Test: atest -c NetworkPolicyManagerServiceTest Merged-In: I02d7f57de1acfd7b03be0a3e1c957ec1e1c5b4d4 Change-Id: I02d7f57de1acfd7b03be0a3e1c957ec1e1c5b4d4
* [MS65.1] Add NetworkIdentity#BuilderJunyu Lai2022-01-201-29/+230
| | | | | | | Test: atest NetworkIdentityTest#testBuilder Bug: 204830222 Change-Id: Ifdb6482a54fb1e6999c82647d2710cb833c78d02
* [MS57.1] Prepare APIs for data migration utilityJunyu Lai2022-01-201-34/+62
| | | | | | | | | | | | | | 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
* [MS64] Remove subscriberId and NetworkId in protoJunyu Lai2022-01-191-5/+0
| | | | | | | | | | | netstats.proto is about to move into mainline module. And it can no longer see privacy.proto definition. Thus, this change remove PII data that is not very useful when debugging and any reference to privacy.proto. Test: adb bugreport and check output at transponder Bug: 204830222 Change-Id: I755530f356d2c16b336d62785c4c17c557f792db
* wifi data usage: replaced Wi-Fi SSID with a Wi-Fi network keyLes Lee2022-01-031-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* [MS08] Move NetworkStats files to f/b/package/ConnectivityTJunyu Lai2021-12-101-0/+286
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