From 24385543489f1cb351300792b8755bf6e26df014 Mon Sep 17 00:00:00 2001 From: Aaron Huang Date: Mon, 14 Mar 2022 10:50:13 +0800 Subject: [PATCH] Create @StringDef for the PREFIX_* values Bug: 222291489 Test: build, FrameworksNetTests Change-Id: If54bed41e96a1b1ef169d89a0caa9e4300578374 --- .../NetworkStatsDataMigrationUtils.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/core/java/android/net/netstats/NetworkStatsDataMigrationUtils.java b/core/java/android/net/netstats/NetworkStatsDataMigrationUtils.java index 2dd3aaa1f55a3..5c9989e9d981c 100644 --- a/core/java/android/net/netstats/NetworkStatsDataMigrationUtils.java +++ b/core/java/android/net/netstats/NetworkStatsDataMigrationUtils.java @@ -27,6 +27,7 @@ import static android.net.NetworkStats.TAG_NONE; import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID; import android.annotation.NonNull; +import android.annotation.StringDef; import android.annotation.SystemApi; import android.net.NetworkIdentity; import android.net.NetworkStatsCollection; @@ -47,6 +48,8 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.net.ProtocolException; import java.util.ArrayList; import java.util.HashMap; @@ -76,6 +79,15 @@ public class NetworkStatsDataMigrationUtils { */ public static final String PREFIX_UID_TAG = "uid_tag"; + /** @hide */ + @StringDef(prefix = {"PREFIX_"}, value = { + PREFIX_XT, + PREFIX_UID, + PREFIX_UID_TAG, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface Prefix {} + private static final HashMap sPrefixLegacyFileNameMap = new HashMap() {{ put(PREFIX_XT, "netstats_xt.bin"); @@ -141,13 +153,13 @@ public class NetworkStatsDataMigrationUtils { // Get /data/system/netstats_*.bin legacy files. Does not check for existence. @NonNull - private static File getLegacyBinFileForPrefix(@NonNull String prefix) { + private static File getLegacyBinFileForPrefix(@NonNull @Prefix String prefix) { return new File(getPlatformSystemDir(), sPrefixLegacyFileNameMap.get(prefix)); } // List /data/system/netstats/[xt|uid|uid_tag].- legacy files. @NonNull - private static ArrayList getPlatformFileListForPrefix(@NonNull String prefix) { + private static ArrayList getPlatformFileListForPrefix(@NonNull @Prefix String prefix) { final ArrayList list = new ArrayList<>(); final File platformFiles = new File(getPlatformBaseDir(), "netstats"); if (platformFiles.exists()) { @@ -207,7 +219,7 @@ public class NetworkStatsDataMigrationUtils { */ @NonNull public static NetworkStatsCollection readPlatformCollection( - @NonNull String prefix, long bucketDuration) throws IOException { + @NonNull @Prefix String prefix, long bucketDuration) throws IOException { final NetworkStatsCollection.Builder builder = new NetworkStatsCollection.Builder(bucketDuration);