diff options
| -rw-r--r-- | core/java/android/net/netstats/NetworkStatsDataMigrationUtils.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/net/netstats/NetworkStatsDataMigrationUtils.java b/core/java/android/net/netstats/NetworkStatsDataMigrationUtils.java index de2f10b86a77..76ee097c8c93 100644 --- a/core/java/android/net/netstats/NetworkStatsDataMigrationUtils.java +++ b/core/java/android/net/netstats/NetworkStatsDataMigrationUtils.java @@ -52,6 +52,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.net.ProtocolException; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.Set; @@ -163,7 +164,10 @@ public class NetworkStatsDataMigrationUtils { final ArrayList<File> list = new ArrayList<>(); final File platformFiles = getPlatformBaseDir(); 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. if (!name.startsWith(prefix + ".")) continue; |