Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MS82.2] Add a rewriteSingle method that takes two timestamps am: 807a7f37f0

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2063311

Change-Id: I0eef3ba0f1385fabfbf9d60349ed2ba8787e9e4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
junyulai
2022-06-01 03:19:55 +00:00
committed by Automerger Merge Worker
parent bb92e9b165 807a7f37f0
commit 8b3b5463e8
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/netstats/NetworkStatsDataMigrationUtils.java
View File

@@ -161,7 +161,7 @@ public class NetworkStatsDataMigrationUtils {
@NonNull @NonNull
private static ArrayList<File> getPlatformFileListForPrefix(@NonNull @Prefix String prefix) { private static ArrayList<File> getPlatformFileListForPrefix(@NonNull @Prefix String prefix) {
final ArrayList<File> list = new ArrayList<>(); final ArrayList<File> list = new ArrayList<>();
final File platformFiles = new File(getPlatformBaseDir(), "netstats"); final File platformFiles = getPlatformBaseDir();
if (platformFiles.exists()) { if (platformFiles.exists()) {
for (String name : platformFiles.list()) { for (String name : platformFiles.list()) {
// Skip when prefix doesn't match. // Skip when prefix doesn't match.

15
core/java/com/android/internal/util/FileRotator.java
View File

@@ -16,6 +16,7 @@
package com.android.internal.util; package com.android.internal.util;
import android.annotation.NonNull;
import android.os.FileUtils; import android.os.FileUtils;
import android.util.Log; import android.util.Log;
@@ -281,6 +282,20 @@ public class FileRotator {
} }
} }
/**
* Process a single file atomically, with the given start and end timestamps.
* If a file with these exact start and end timestamps does not exist, a new
* empty file will be written.
*/
public void rewriteSingle(@NonNull Rewriter rewriter, long startTimeMillis, long endTimeMillis)
throws IOException {
final FileInfo info = new FileInfo(mPrefix);
info.startMillis = startTimeMillis;
info.endMillis = endTimeMillis;
rewriteSingle(rewriter, info.build());
}
/** /**
* Read any rotated data that overlap the requested time range. * Read any rotated data that overlap the requested time range.
*/ */