| commit | 90ff418b8b1999e724e2cb3cda9ee0b16375f3c9 | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Fri Jan 19 02:59:06 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 19 02:59:06 2024 +0000 |
| tree | baf05b3334a1bc1b8f0de0e51d797735131a846e | |
| parent | 414fcd758c6a7e1fc383869df89c1be6af29f316 [diff] | |
| parent | 91694abf58c27d5d9296141e23d2555f27006681 [diff] |
Merge "Check stats dir instead of making one" into main am: 91694abf58 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2916466 Change-Id: Id547b0a8636f847073dfdf086b558fa87d321b0d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/service-t/src/com/android/metrics/NetworkStatsMetricsLogger.java b/service-t/src/com/android/metrics/NetworkStatsMetricsLogger.java index 3ed21a2..08a8603 100644 --- a/service-t/src/com/android/metrics/NetworkStatsMetricsLogger.java +++ b/service-t/src/com/android/metrics/NetworkStatsMetricsLogger.java
@@ -109,7 +109,7 @@ */ private static Pair<Integer, Integer> getStatsFilesAttributes( @Nullable File statsDir, @NonNull String prefix) { - if (statsDir == null) return new Pair<>(0, 0); + if (statsDir == null || !statsDir.isDirectory()) return new Pair<>(0, 0); // Only counts the matching files. // The files are named in the following format: @@ -118,9 +118,6 @@ // See FileRotator#FileInfo for more detail. final Pattern pattern = Pattern.compile("^" + prefix + "\\.[0-9]+-[0-9]*$"); - // Ensure that base path exists. - statsDir.mkdirs(); - int totalFiles = 0; int totalBytes = 0; for (String name : emptyIfNull(statsDir.list())) {