summaryrefslogtreecommitdiff
path: root/framework-t/src/android/net/NetworkIdentitySet.java
Commit message (Collapse)AuthorAgeFilesLines
* Fix NullPointerException happens in dumpCheckinAaron Huang2022-04-191-0/+1
| | | | | | | | | | | | | | | Currently dumpCheckin passes a null object to create the contructor of NetworkStatsCollection.Key but the constructor requires non-null object. Thus, it caused the NPE in dumpCheckin. To fix this exception, create an NetworkIdentitySet() object instead of using an null object. Bug: 225131008 Bug: 226539404 Test: dumpsys netstats --checkin is fine FrameworksNetTests Change-Id: I7f2dadf0647b3f42e0f667d96291d2ae37e23faf
* Merge "Fix proto invalid write type"Aaron Huang2022-03-221-1/+1
|\
| * Fix proto invalid write typeAaron Huang2022-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-03-021-2/+12
|/ | | | | | | | | | | | | | | | | | | 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
* [MS54.1] Move NetworkStats to updatable sourcesJunyu Lai2022-02-181-1/+1
| | | | | | | | | | | | | | | | 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
* [MS58] Expose Apis which will be used by data migration utilityJunyu Lai2022-01-241-11/+15
| | | | | | | | | | | | | 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.1] Add NetworkIdentity#BuilderJunyu Lai2022-01-201-6/+6
| | | | | | | Test: atest NetworkIdentityTest#testBuilder Bug: 204830222 Change-Id: Ifdb6482a54fb1e6999c82647d2710cb833c78d02
* [MS57.1] Prepare APIs for data migration utilityJunyu Lai2022-01-201-9/+29
| | | | | | | | | | | | | | 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
* [MS07.1] Move NetworkStatsCollection/IdentitySet into frameworksJunyu Lai2021-12-101-0/+196
These files are needed for the data migration util system Api interfaces to allow OEMs to construct NetworkStats* objects. Thus, they need to be moved into android.net package, and some of them will be exposed as @SystemApi in T. Eventually these classes will be moved into the Connectivity module, but in the mean time they will be temporarily moved to f/b/package/ConnectivityT for the preparation stage. However, the tests are already in the module. Therefore for the S-derived branch, the test cannot see the renamed classes since any framework CLs will not be auto-merged into this branch. Thus, the tests need to stay disabled on the S-derived branch, and will be re-enabled after all files are moved into the module. Test: TH Bug: 197717846 Change-Id: I95278a99cf2437ada28001161ceea17a1d32f2a4