Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e6f1d87 authored by Natasha Lee's avatar Natasha Lee Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I71d67da11ba2652aca0fdcf6f8143edcc7f7c924
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8b3b5463 29c927e4

core/java/android/net/netstats/NetworkStatsDataMigrationUtils.java

+5 −1
Original line number Diff line number Diff line
@@ -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;