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

Commit 4b9e63e2 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by android-build-merger
Browse files

Merge "Add the defaultNetwork parameter to the NetworkStats.Entry." am: fd998714 am: 0366e739 

am: 7a487fa7

Change-Id: Ieb7bbe3f58198addaf9d91db3872f5b5b13bfba1
parents a390832d 7a487fa7

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+4 −3
Original line number Diff line number Diff line
@@ -3151,7 +3151,8 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
        // Uid -1 indicates this is for the overall device data usage.

        vtDataUsageSnapshot.combineValues(new NetworkStats.Entry(

                NetworkStatsService.VT_INTERFACE, -1, NetworkStats.SET_FOREGROUND,

                NetworkStats.TAG_NONE, 1, isRoaming, delta / 2, 0, delta / 2, 0, 0));

                NetworkStats.TAG_NONE, NetworkStats.METERED_YES, isRoaming,

                NetworkStats.DEFAULT_NETWORK_YES, delta / 2, 0, delta / 2, 0, 0));

        mVtDataUsageSnapshot = vtDataUsageSnapshot;



        // Create the snapshot of video call data usage per dialer. combineValues will create
@@ -3173,8 +3174,8 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
        // the only thing we can do here is splitting the usage into half rx and half tx.

        vtDataUsageUidSnapshot.combineValues(new NetworkStats.Entry(

                NetworkStatsService.VT_INTERFACE, mDefaultDialerUid.get(),

                NetworkStats.SET_FOREGROUND, NetworkStats.TAG_NONE, 1, isRoaming, delta / 2,

                0, delta / 2, 0, 0));

                NetworkStats.SET_FOREGROUND, NetworkStats.TAG_NONE, NetworkStats.METERED_YES,

                isRoaming, NetworkStats.DEFAULT_NETWORK_YES, delta / 2, 0, delta / 2, 0, 0));

        mVtDataUsageUidSnapshot = vtDataUsageUidSnapshot;

    }