diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-12-10 18:57:08 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-10 18:57:08 +0000 |
commit | 6d0a6803c919b57d9d4d5b6ce6994911791bef91 (patch) | |
tree | e0aa8f0757b7681246248e0a4f72d99950b9009c | |
parent | 27383c906cf7bec7f328321bfd92e4f6f9034643 (diff) | |
parent | 942c713c9d7eaee419c88a8c6a3a0f9d07c81a08 (diff) | |
download | base-6d0a6803c919b57d9d4d5b6ce6994911791bef91.tar.gz |
Merge changes from topic "ms07-movestats" am: 942c713c9d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1895044
Change-Id: I85d704b09dac07e91b8400a2bbd15867e2b80d6d
-rw-r--r-- | Android.bp | 2 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/Android.bp | 68 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/aidl-export/android/net/NetworkStats.aidl (renamed from core/java/android/net/NetworkStats.aidl) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/aidl-export/android/net/NetworkTemplate.aidl (renamed from core/java/android/net/NetworkTemplate.aidl) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/src/android/app/usage/NetworkStats.java (renamed from core/java/android/app/usage/NetworkStats.java) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/src/android/app/usage/NetworkStatsManager.java (renamed from core/java/android/app/usage/NetworkStatsManager.java) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/src/android/net/DataUsageRequest.aidl (renamed from core/java/android/net/DataUsageRequest.aidl) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/src/android/net/DataUsageRequest.java (renamed from core/java/android/net/DataUsageRequest.java) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/src/android/net/INetworkStatsService.aidl (renamed from core/java/android/net/INetworkStatsService.aidl) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/src/android/net/INetworkStatsSession.aidl (renamed from core/java/android/net/INetworkStatsSession.aidl) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/src/android/net/NetworkIdentity.java (renamed from core/java/android/net/NetworkIdentity.java) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/src/android/net/NetworkIdentitySet.java (renamed from services/core/java/com/android/server/net/NetworkIdentitySet.java) | 13 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/src/android/net/NetworkStateSnapshot.aidl (renamed from core/java/android/net/NetworkStateSnapshot.aidl) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/src/android/net/NetworkStateSnapshot.java (renamed from core/java/android/net/NetworkStateSnapshot.java) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/src/android/net/NetworkStats.java (renamed from core/java/android/net/NetworkStats.java) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/src/android/net/NetworkStatsAccess.java (renamed from services/core/java/com/android/server/net/NetworkStatsAccess.java) | 10 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/src/android/net/NetworkStatsCollection.java (renamed from services/core/java/com/android/server/net/NetworkStatsCollection.java) | 35 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/src/android/net/NetworkStatsHistory.aidl (renamed from core/java/android/net/NetworkStatsHistory.aidl) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/src/android/net/NetworkStatsHistory.java (renamed from core/java/android/net/NetworkStatsHistory.java) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/src/android/net/NetworkTemplate.java (renamed from core/java/android/net/NetworkTemplate.java) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/src/android/net/TrafficStats.java (renamed from core/java/android/net/TrafficStats.java) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/src/android/net/UnderlyingNetworkInfo.aidl (renamed from core/java/android/net/UnderlyingNetworkInfo.aidl) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/src/android/net/UnderlyingNetworkInfo.java (renamed from core/java/android/net/UnderlyingNetworkInfo.java) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/src/android/net/netstats/provider/INetworkStatsProvider.aidl (renamed from core/java/android/net/netstats/provider/INetworkStatsProvider.aidl) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/src/android/net/netstats/provider/INetworkStatsProviderCallback.aidl (renamed from core/java/android/net/netstats/provider/INetworkStatsProviderCallback.aidl) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/src/android/net/netstats/provider/NetworkStatsProvider.java (renamed from core/java/android/net/netstats/provider/NetworkStatsProvider.java) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/service/Android.bp | 36 | ||||
-rw-r--r-- | packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsFactory.java (renamed from services/core/java/com/android/server/net/NetworkStatsFactory.java) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsManagerInternal.java (renamed from services/core/java/com/android/server/net/NetworkStatsManagerInternal.java) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsObservers.java (renamed from services/core/java/com/android/server/net/NetworkStatsObservers.java) | 3 | ||||
-rw-r--r-- | packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsRecorder.java (renamed from services/core/java/com/android/server/net/NetworkStatsRecorder.java) | 3 | ||||
-rw-r--r-- | packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsService.java (renamed from services/core/java/com/android/server/net/NetworkStatsService.java) | 3 | ||||
-rw-r--r-- | packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsSubscriptionsMonitor.java (renamed from services/core/java/com/android/server/net/NetworkStatsSubscriptionsMonitor.java) | 0 | ||||
-rw-r--r-- | services/core/Android.bp | 2 |
34 files changed, 147 insertions, 28 deletions
diff --git a/Android.bp b/Android.bp index f8a9e0f0f393..ecf6deeeb432 100644 --- a/Android.bp +++ b/Android.bp @@ -69,7 +69,7 @@ filegroup { // Java/AIDL sources under frameworks/base ":framework-annotations", ":framework-blobstore-sources", - ":framework-connectivity-nsd-sources", + ":framework-connectivity-tiramisu-sources", ":framework-core-sources", ":framework-drm-sources", ":framework-graphics-nonupdatable-sources", diff --git a/packages/ConnectivityT/framework-t/Android.bp b/packages/ConnectivityT/framework-t/Android.bp index 2363a9f8d4a3..9c07f399f92e 100644 --- a/packages/ConnectivityT/framework-t/Android.bp +++ b/packages/ConnectivityT/framework-t/Android.bp @@ -19,11 +19,58 @@ package { default_applicable_licenses: ["Android-Apache-2.0"], } +// NetworkStats related libraries. + +filegroup { + name: "framework-connectivity-netstats-internal-sources", + srcs: [ + "src/android/app/usage/*.java", + "src/android/net/DataUsage*.*", + "src/android/net/INetworkStats*.*", + "src/android/net/NetworkIdentity*.java", + "src/android/net/NetworkStateSnapshot.*", + "src/android/net/NetworkStats*.*", + "src/android/net/NetworkTemplate.*", + "src/android/net/TrafficStats.java", + "src/android/net/UnderlyingNetworkInfo.*", + "src/android/net/netstats/**/*.*", + ], + path: "src", + visibility: [ + "//visibility:private", + ], +} + +filegroup { + name: "framework-connectivity-netstats-aidl-export-sources", + srcs: [ + "aidl-export/android/net/NetworkStats.aidl", + "aidl-export/android/net/NetworkTemplate.aidl", + ], + path: "aidl-export", + visibility: [ + "//visibility:private", + ], +} + +filegroup { + name: "framework-connectivity-netstats-sources", + srcs: [ + ":framework-connectivity-netstats-internal-sources", + ":framework-connectivity-netstats-aidl-export-sources", + ], + visibility: [ + "//visibility:private", + ], +} + +// Nsd related libraries. + filegroup { name: "framework-connectivity-nsd-internal-sources", srcs: [ - "src/**/*.java", - "src/**/*.aidl", + "src/android/net/nsd/*.aidl", + "src/android/net/nsd/*.java", ], path: "src", visibility: [ @@ -34,7 +81,7 @@ filegroup { filegroup { name: "framework-connectivity-nsd-aidl-export-sources", srcs: [ - "aidl-export/**/*.aidl", + "aidl-export/android/net/nsd/*.aidl", ], path: "aidl-export", visibility: [ @@ -49,6 +96,19 @@ filegroup { ":framework-connectivity-nsd-aidl-export-sources", ], visibility: [ - "//frameworks/base", + "//visibility:private", ], } + +// Connectivity-T common libraries. + +filegroup { + name: "framework-connectivity-tiramisu-sources", + srcs: [ + ":framework-connectivity-netstats-sources", + ":framework-connectivity-nsd-sources", + ], + visibility: [ + "//frameworks/base", + ], +}
\ No newline at end of file diff --git a/core/java/android/net/NetworkStats.aidl b/packages/ConnectivityT/framework-t/aidl-export/android/net/NetworkStats.aidl index d06ca65a3e0d..d06ca65a3e0d 100644 --- a/core/java/android/net/NetworkStats.aidl +++ b/packages/ConnectivityT/framework-t/aidl-export/android/net/NetworkStats.aidl diff --git a/core/java/android/net/NetworkTemplate.aidl b/packages/ConnectivityT/framework-t/aidl-export/android/net/NetworkTemplate.aidl index 3d37488d9881..3d37488d9881 100644 --- a/core/java/android/net/NetworkTemplate.aidl +++ b/packages/ConnectivityT/framework-t/aidl-export/android/net/NetworkTemplate.aidl diff --git a/core/java/android/app/usage/NetworkStats.java b/packages/ConnectivityT/framework-t/src/android/app/usage/NetworkStats.java index 216a4a0987f5..216a4a0987f5 100644 --- a/core/java/android/app/usage/NetworkStats.java +++ b/packages/ConnectivityT/framework-t/src/android/app/usage/NetworkStats.java diff --git a/core/java/android/app/usage/NetworkStatsManager.java b/packages/ConnectivityT/framework-t/src/android/app/usage/NetworkStatsManager.java index 8a6c85d54896..8a6c85d54896 100644 --- a/core/java/android/app/usage/NetworkStatsManager.java +++ b/packages/ConnectivityT/framework-t/src/android/app/usage/NetworkStatsManager.java diff --git a/core/java/android/net/DataUsageRequest.aidl b/packages/ConnectivityT/framework-t/src/android/net/DataUsageRequest.aidl index d1937c7b8c62..d1937c7b8c62 100644 --- a/core/java/android/net/DataUsageRequest.aidl +++ b/packages/ConnectivityT/framework-t/src/android/net/DataUsageRequest.aidl diff --git a/core/java/android/net/DataUsageRequest.java b/packages/ConnectivityT/framework-t/src/android/net/DataUsageRequest.java index b06d515b3acf..b06d515b3acf 100644 --- a/core/java/android/net/DataUsageRequest.java +++ b/packages/ConnectivityT/framework-t/src/android/net/DataUsageRequest.java diff --git a/core/java/android/net/INetworkStatsService.aidl b/packages/ConnectivityT/framework-t/src/android/net/INetworkStatsService.aidl index 12937b5cb2c7..12937b5cb2c7 100644 --- a/core/java/android/net/INetworkStatsService.aidl +++ b/packages/ConnectivityT/framework-t/src/android/net/INetworkStatsService.aidl diff --git a/core/java/android/net/INetworkStatsSession.aidl b/packages/ConnectivityT/framework-t/src/android/net/INetworkStatsSession.aidl index dfedf6633dcd..dfedf6633dcd 100644 --- a/core/java/android/net/INetworkStatsSession.aidl +++ b/packages/ConnectivityT/framework-t/src/android/net/INetworkStatsSession.aidl diff --git a/core/java/android/net/NetworkIdentity.java b/packages/ConnectivityT/framework-t/src/android/net/NetworkIdentity.java index eb8f43e3d073..eb8f43e3d073 100644 --- a/core/java/android/net/NetworkIdentity.java +++ b/packages/ConnectivityT/framework-t/src/android/net/NetworkIdentity.java diff --git a/services/core/java/com/android/server/net/NetworkIdentitySet.java b/packages/ConnectivityT/framework-t/src/android/net/NetworkIdentitySet.java index 22ed781da92d..abbebef85c8f 100644 --- a/services/core/java/com/android/server/net/NetworkIdentitySet.java +++ b/packages/ConnectivityT/framework-t/src/android/net/NetworkIdentitySet.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package com.android.server.net; +package android.net; + +import static android.net.ConnectivityManager.TYPE_MOBILE; -import android.net.NetworkIdentity; import android.service.NetworkIdentitySetProto; import android.util.proto.ProtoOutputStream; @@ -25,8 +26,6 @@ import java.io.DataOutput; import java.io.IOException; import java.util.HashSet; -import static android.net.ConnectivityManager.TYPE_MOBILE; - /** * Identity of a {@code iface}, defined by the set of {@link NetworkIdentity} * active on that interface. @@ -97,6 +96,9 @@ public class NetworkIdentitySet extends HashSet<NetworkIdentity> implements } } + /** + * Method to serialize this object into a {@code DataOutput}. + */ public void writeToStream(DataOutput out) throws IOException { out.writeInt(VERSION_ADD_OEM_MANAGED_NETWORK); out.writeInt(size()); @@ -179,6 +181,9 @@ public class NetworkIdentitySet extends HashSet<NetworkIdentity> implements return ident.compareTo(anotherIdent); } + /** + * Method to dump this object into proto debug file. + */ public void dumpDebug(ProtoOutputStream proto, long tag) { final long start = proto.start(tag); diff --git a/core/java/android/net/NetworkStateSnapshot.aidl b/packages/ConnectivityT/framework-t/src/android/net/NetworkStateSnapshot.aidl index cb602d7927ce..cb602d7927ce 100644 --- a/core/java/android/net/NetworkStateSnapshot.aidl +++ b/packages/ConnectivityT/framework-t/src/android/net/NetworkStateSnapshot.aidl diff --git a/core/java/android/net/NetworkStateSnapshot.java b/packages/ConnectivityT/framework-t/src/android/net/NetworkStateSnapshot.java index 39156343924d..39156343924d 100644 --- a/core/java/android/net/NetworkStateSnapshot.java +++ b/packages/ConnectivityT/framework-t/src/android/net/NetworkStateSnapshot.java diff --git a/core/java/android/net/NetworkStats.java b/packages/ConnectivityT/framework-t/src/android/net/NetworkStats.java index c7ffc1933829..c7ffc1933829 100644 --- a/core/java/android/net/NetworkStats.java +++ b/packages/ConnectivityT/framework-t/src/android/net/NetworkStats.java diff --git a/services/core/java/com/android/server/net/NetworkStatsAccess.java b/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsAccess.java index d25eae409d40..3885a9e6d5cb 100644 --- a/services/core/java/com/android/server/net/NetworkStatsAccess.java +++ b/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsAccess.java @@ -11,10 +11,10 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License + * limitations under the License. */ -package com.android.server.net; +package android.net; import static android.Manifest.permission.READ_NETWORK_USAGE_HISTORY; import static android.net.NetworkStats.UID_ALL; @@ -37,7 +37,11 @@ import com.android.server.LocalServices; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -/** Utility methods for controlling access to network stats APIs. */ +/** + * Utility methods for controlling access to network stats APIs. + * + * @hide + */ public final class NetworkStatsAccess { private NetworkStatsAccess() {} diff --git a/services/core/java/com/android/server/net/NetworkStatsCollection.java b/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsCollection.java index 213ea402f5b2..0d3b9ed4e3d4 100644 --- a/services/core/java/com/android/server/net/NetworkStatsCollection.java +++ b/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsCollection.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server.net; +package android.net; import static android.net.NetworkStats.DEFAULT_NETWORK_NO; import static android.net.NetworkStats.DEFAULT_NETWORK_YES; @@ -31,13 +31,7 @@ import static android.net.TrafficStats.UID_REMOVED; import static android.text.format.DateUtils.WEEK_IN_MILLIS; import static com.android.internal.net.NetworkUtilsInternal.multiplySafeByRational; -import static com.android.server.net.NetworkStatsService.TAG; -import android.net.NetworkIdentity; -import android.net.NetworkStats; -import android.net.NetworkStatsHistory; -import android.net.NetworkTemplate; -import android.net.TrafficStats; import android.os.Binder; import android.service.NetworkStatsCollectionKeyProto; import android.service.NetworkStatsCollectionProto; @@ -85,8 +79,11 @@ import java.util.Objects; /** * Collection of {@link NetworkStatsHistory}, stored based on combined key of * {@link NetworkIdentitySet}, UID, set, and tag. Knows how to persist itself. + * + * @hide */ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.Writer { + private static final String TAG = NetworkStatsCollection.class.getSimpleName(); /** File header magic number: "ANET" */ private static final int FILE_MAGIC = 0x414E4554; @@ -366,8 +363,8 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W entry.uid = key.uid; entry.set = key.set; entry.tag = key.tag; - entry.defaultNetwork = key.ident.areAllMembersOnDefaultNetwork() ? - DEFAULT_NETWORK_YES : DEFAULT_NETWORK_NO; + entry.defaultNetwork = key.ident.areAllMembersOnDefaultNetwork() + ? DEFAULT_NETWORK_YES : DEFAULT_NETWORK_NO; entry.metered = key.ident.isAnyMemberMetered() ? METERED_YES : METERED_NO; entry.roaming = key.ident.isAnyMemberRoaming() ? ROAMING_YES : ROAMING_NO; entry.rxBytes = historyEntry.rxBytes; @@ -521,6 +518,12 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W } } + /** + * Read legacy network summary statistics file format into the collection, + * See {@code NetworkStatsService#maybeUpgradeLegacyStatsLocked}. + * + * @deprecated + */ @Deprecated public void readLegacyNetwork(File file) throws IOException { final AtomicFile inputFile = new AtomicFile(file); @@ -560,6 +563,12 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W } } + /** + * Read legacy Uid statistics file format into the collection, + * See {@code NetworkStatsService#maybeUpgradeLegacyStatsLocked}. + * + * @deprecated + */ @Deprecated public void readLegacyUid(File file, boolean onlyTags) throws IOException { final AtomicFile inputFile = new AtomicFile(file); @@ -774,19 +783,19 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W public final int set; public final int tag; - private final int hashCode; + private final int mHashCode; - public Key(NetworkIdentitySet ident, int uid, int set, int tag) { + Key(NetworkIdentitySet ident, int uid, int set, int tag) { this.ident = ident; this.uid = uid; this.set = set; this.tag = tag; - hashCode = Objects.hash(ident, uid, set, tag); + mHashCode = Objects.hash(ident, uid, set, tag); } @Override public int hashCode() { - return hashCode; + return mHashCode; } @Override diff --git a/core/java/android/net/NetworkStatsHistory.aidl b/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsHistory.aidl index 8b9069f8fa48..8b9069f8fa48 100644 --- a/core/java/android/net/NetworkStatsHistory.aidl +++ b/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsHistory.aidl diff --git a/core/java/android/net/NetworkStatsHistory.java b/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsHistory.java index a875e1ad45a3..a875e1ad45a3 100644 --- a/core/java/android/net/NetworkStatsHistory.java +++ b/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsHistory.java diff --git a/core/java/android/net/NetworkTemplate.java b/packages/ConnectivityT/framework-t/src/android/net/NetworkTemplate.java index c906a13bf41b..c906a13bf41b 100644 --- a/core/java/android/net/NetworkTemplate.java +++ b/packages/ConnectivityT/framework-t/src/android/net/NetworkTemplate.java diff --git a/core/java/android/net/TrafficStats.java b/packages/ConnectivityT/framework-t/src/android/net/TrafficStats.java index fa650617f380..fa650617f380 100644 --- a/core/java/android/net/TrafficStats.java +++ b/packages/ConnectivityT/framework-t/src/android/net/TrafficStats.java diff --git a/core/java/android/net/UnderlyingNetworkInfo.aidl b/packages/ConnectivityT/framework-t/src/android/net/UnderlyingNetworkInfo.aidl index a56f2f40583b..a56f2f40583b 100644 --- a/core/java/android/net/UnderlyingNetworkInfo.aidl +++ b/packages/ConnectivityT/framework-t/src/android/net/UnderlyingNetworkInfo.aidl diff --git a/core/java/android/net/UnderlyingNetworkInfo.java b/packages/ConnectivityT/framework-t/src/android/net/UnderlyingNetworkInfo.java index 33f9375c03bf..33f9375c03bf 100644 --- a/core/java/android/net/UnderlyingNetworkInfo.java +++ b/packages/ConnectivityT/framework-t/src/android/net/UnderlyingNetworkInfo.java diff --git a/core/java/android/net/netstats/provider/INetworkStatsProvider.aidl b/packages/ConnectivityT/framework-t/src/android/net/netstats/provider/INetworkStatsProvider.aidl index 74c3ba44b69e..74c3ba44b69e 100644 --- a/core/java/android/net/netstats/provider/INetworkStatsProvider.aidl +++ b/packages/ConnectivityT/framework-t/src/android/net/netstats/provider/INetworkStatsProvider.aidl diff --git a/core/java/android/net/netstats/provider/INetworkStatsProviderCallback.aidl b/packages/ConnectivityT/framework-t/src/android/net/netstats/provider/INetworkStatsProviderCallback.aidl index 7eaa01e262fe..7eaa01e262fe 100644 --- a/core/java/android/net/netstats/provider/INetworkStatsProviderCallback.aidl +++ b/packages/ConnectivityT/framework-t/src/android/net/netstats/provider/INetworkStatsProviderCallback.aidl diff --git a/core/java/android/net/netstats/provider/NetworkStatsProvider.java b/packages/ConnectivityT/framework-t/src/android/net/netstats/provider/NetworkStatsProvider.java index 23fc06927ef9..23fc06927ef9 100644 --- a/core/java/android/net/netstats/provider/NetworkStatsProvider.java +++ b/packages/ConnectivityT/framework-t/src/android/net/netstats/provider/NetworkStatsProvider.java diff --git a/packages/ConnectivityT/service/Android.bp b/packages/ConnectivityT/service/Android.bp index 529f58d130ed..6a64910609ff 100644 --- a/packages/ConnectivityT/service/Android.bp +++ b/packages/ConnectivityT/service/Android.bp @@ -19,13 +19,45 @@ package { default_applicable_licenses: ["Android-Apache-2.0"], } +// NetworkStats related libraries. + +filegroup { + name: "services.connectivity-netstats-sources", + srcs: [ + "src/com/android/server/net/NetworkIdentity*.java", + "src/com/android/server/net/NetworkStats*.java", + ], + path: "src", + visibility: [ + "//visibility:private", + ], +} + +// Nsd related libraries. + filegroup { name: "services.connectivity-nsd-sources", srcs: [ - "src/**/*.java", + "src/com/android/server/INativeDaemon*.java", + "src/com/android/server/NativeDaemon*.java", + "src/com/android/server/Nsd*.java", ], path: "src", visibility: [ - "//frameworks/base/services/core", + "//visibility:private", ], } + +// Connectivity-T common libraries. + +filegroup { + name: "services.connectivity-tiramisu-sources", + srcs: [ + ":services.connectivity-netstats-sources", + ":services.connectivity-nsd-sources", + ], + path: "src", + visibility: [ + "//frameworks/base/services/core", + ], +}
\ No newline at end of file diff --git a/services/core/java/com/android/server/net/NetworkStatsFactory.java b/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsFactory.java index e6433db11d7b..e6433db11d7b 100644 --- a/services/core/java/com/android/server/net/NetworkStatsFactory.java +++ b/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsFactory.java diff --git a/services/core/java/com/android/server/net/NetworkStatsManagerInternal.java b/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsManagerInternal.java index 0e9a9da6804b..0e9a9da6804b 100644 --- a/services/core/java/com/android/server/net/NetworkStatsManagerInternal.java +++ b/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsManagerInternal.java diff --git a/services/core/java/com/android/server/net/NetworkStatsObservers.java b/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsObservers.java index 2564daeaa1c0..1a0866d2f9c5 100644 --- a/services/core/java/com/android/server/net/NetworkStatsObservers.java +++ b/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsObservers.java @@ -22,7 +22,10 @@ import static com.android.internal.util.Preconditions.checkArgument; import android.app.usage.NetworkStatsManager; import android.net.DataUsageRequest; +import android.net.NetworkIdentitySet; import android.net.NetworkStats; +import android.net.NetworkStatsAccess; +import android.net.NetworkStatsCollection; import android.net.NetworkStatsHistory; import android.net.NetworkTemplate; import android.os.Bundle; diff --git a/services/core/java/com/android/server/net/NetworkStatsRecorder.java b/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsRecorder.java index 978ae87d39d5..5e27c776ccb0 100644 --- a/services/core/java/com/android/server/net/NetworkStatsRecorder.java +++ b/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsRecorder.java @@ -21,8 +21,11 @@ import static android.net.TrafficStats.KB_IN_BYTES; import static android.net.TrafficStats.MB_IN_BYTES; import static android.text.format.DateUtils.YEAR_IN_MILLIS; +import android.net.NetworkIdentitySet; import android.net.NetworkStats; import android.net.NetworkStats.NonMonotonicObserver; +import android.net.NetworkStatsAccess; +import android.net.NetworkStatsCollection; import android.net.NetworkStatsHistory; import android.net.NetworkTemplate; import android.net.TrafficStats; diff --git a/services/core/java/com/android/server/net/NetworkStatsService.java b/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsService.java index c876d411fac1..2beca73ecd72 100644 --- a/services/core/java/com/android/server/net/NetworkStatsService.java +++ b/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsService.java @@ -96,11 +96,14 @@ import android.net.INetworkStatsSession; import android.net.Network; import android.net.NetworkCapabilities; import android.net.NetworkIdentity; +import android.net.NetworkIdentitySet; import android.net.NetworkSpecifier; import android.net.NetworkStack; import android.net.NetworkStateSnapshot; import android.net.NetworkStats; import android.net.NetworkStats.NonMonotonicObserver; +import android.net.NetworkStatsAccess; +import android.net.NetworkStatsCollection; import android.net.NetworkStatsHistory; import android.net.NetworkTemplate; import android.net.TelephonyNetworkSpecifier; diff --git a/services/core/java/com/android/server/net/NetworkStatsSubscriptionsMonitor.java b/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsSubscriptionsMonitor.java index 5646c752fc90..5646c752fc90 100644 --- a/services/core/java/com/android/server/net/NetworkStatsSubscriptionsMonitor.java +++ b/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsSubscriptionsMonitor.java diff --git a/services/core/Android.bp b/services/core/Android.bp index d65969c11357..1dda14ca0db5 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -111,7 +111,7 @@ java_library_static { "java/com/android/server/am/EventLogTags.logtags", "java/com/android/server/wm/EventLogTags.logtags", "java/com/android/server/policy/EventLogTags.logtags", - ":services.connectivity-nsd-sources", + ":services.connectivity-tiramisu-sources", ], libs: [ |