| commit | c55b0d5adc148df6f1ad6d71570c4499c0ac950d | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Fri Jan 19 03:41:28 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 19 03:41:28 2024 +0000 |
| tree | f3b859b374cfac5c786009a7ac9409c99ee25a7c | |
| parent | 89c24e7069cbaad0236cfcd8d0e5f48dc135c1b8 [diff] | |
| parent | 90ff418b8b1999e724e2cb3cda9ee0b16375f3c9 [diff] |
Merge "Check stats dir instead of making one" into main am: 91694abf58 am: 90ff418b8b Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2916466 Change-Id: I57829a82b082b68de9d19b2b56fc0ee66a7e5235 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())) {