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

Commit 968c8191 authored by Vova Sharaienko's avatar Vova Sharaienko Committed by Automerger Merge Worker
Browse files

Merge "StatsPullAtomService: Fixed StrictMode warning" into main am: 02d70c5e am: 75e599ac 

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



Change-Id: Ib10fff915b60d15d298c5aa60b29be7254fbe9db
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 06698f3a 75e599ac

services/core/java/com/android/server/stats/pull/StatsPullAtomService.java

+2 −0
Original line number Diff line number Diff line
@@ -1421,6 +1421,7 @@ public class StatsPullAtomService extends SystemService { 


        final NetworkStats nonTaggedStats =

                NetworkStatsUtils.fromPublicNetworkStats(queryNonTaggedStats);

        queryNonTaggedStats.close();

        if (!includeTags) return nonTaggedStats;



        final android.app.usage.NetworkStats queryTaggedStats =
@@ -1429,6 +1430,7 @@ public class StatsPullAtomService extends SystemService { 
                        currentTimeInMillis);

        final NetworkStats taggedStats =

                NetworkStatsUtils.fromPublicNetworkStats(queryTaggedStats);

        queryTaggedStats.close();

        return nonTaggedStats.add(taggedStats);

    }