4b2fa5914a68612ee93a586e320cdcbecdc55e6e - android_packages_modules_Connectivity

commit	4b2fa5914a68612ee93a586e320cdcbecdc55e6e	[log] [tgz]
author	Junyu Lai <junyulai@google.com>	Fri Dec 10 07:46:43 2021 +0000
committer	Junyu Lai <junyulai@google.com>	Fri Dec 10 16:11:08 2021 +0000
tree	61bd986ac6a63b46c96d2b1591e2cb7b99d99f3e
parent	8074ed308bafdbc868406aa9aae3ec466685a755 [diff]

[MS07.1] Move NetworkStatsCollection/IdentitySet into frameworks

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

framework-t/src/android/net/NetworkIdentitySet.java[Renamed from service-t/src/com/android/server/net/NetworkIdentitySet.java - diff]
framework-t/src/android/net/NetworkStatsAccess.java[Renamed from service-t/src/com/android/server/net/NetworkStatsAccess.java - diff]
framework-t/src/android/net/NetworkStatsCollection.java[Renamed from service-t/src/com/android/server/net/NetworkStatsCollection.java - diff]
service-t/src/com/android/server/net/NetworkStatsObservers.java[diff]
service-t/src/com/android/server/net/NetworkStatsRecorder.java[diff]
service-t/src/com/android/server/net/NetworkStatsService.java[diff]

6 files changed

tree: 61bd986ac6a63b46c96d2b1591e2cb7b99d99f3e