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

Merge changes from topic "stats-migration" am: 29c927e4e7

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

Change-Id: I71d67da11ba2652aca0fdcf6f8143edcc7f7c924
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Natasha Lee
2022-06-01 03:20:06 +00:00
committed by Automerger Merge Worker
parent 8b3b5463e8 29c927e4e7
commit 4e6f1d8713
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,6 +52,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.net.ProtocolException; import java.net.ProtocolException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
@@ -163,7 +164,10 @@ public class NetworkStatsDataMigrationUtils {
final ArrayList<File> list = new ArrayList<>(); final ArrayList<File> list = new ArrayList<>();
final File platformFiles = getPlatformBaseDir(); final File platformFiles = getPlatformBaseDir();
if (platformFiles.exists()) { if (platformFiles.exists()) {
for (String name : platformFiles.list()) { final String[] files = platformFiles.list();
if (files == null) return list;
Arrays.sort(files);
for (String name : files) {
// Skip when prefix doesn't match. // Skip when prefix doesn't match.
if (!name.startsWith(prefix + ".")) continue; if (!name.startsWith(prefix + ".")) continue;