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

Commit 26fbbbc4 authored by Amit Mahajan's avatar Amit Mahajan Committed by Gerrit Code Review
Browse files

Merge "Remove usage of NetworkStatsService from telephony-common."

parents 2c979cd6 e8359c84

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ java_library { 
        "android.hardware.radio-V1.5-java",

        "voip-common",

        "ims-common",

        "services",

        "unsupportedappusage",

        "telephony-resources",

    ],

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

+2 −3
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ import com.android.internal.telephony.metrics.TelephonyMetrics; 
import com.android.internal.telephony.nano.TelephonyProto.TelephonyCallSession;

import com.android.internal.telephony.nano.TelephonyProto.TelephonyCallSession.Event.ImsCommand;

import com.android.internal.util.IndentingPrintWriter;

import com.android.server.net.NetworkStatsService;

import com.android.telephony.Rlog;



import java.io.FileDescriptor;
@@ -3983,7 +3982,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
        // the only thing we can do here is splitting the usage into half rx and half tx.

        // Uid -1 indicates this is for the overall device data usage.

        vtDataUsageSnapshot.combineValues(new NetworkStats.Entry(

                NetworkStatsService.VT_INTERFACE, -1, NetworkStats.SET_FOREGROUND,

                NetworkStats.IFACE_VT, -1, NetworkStats.SET_FOREGROUND,

                NetworkStats.TAG_NONE, NetworkStats.METERED_YES, isRoaming,

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

        mVtDataUsageSnapshot = vtDataUsageSnapshot;
@@ -4006,7 +4005,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
        // Since the modem only reports the total vt data usage rather than rx/tx separately,

        // 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.IFACE_VT, mDefaultDialerUid.get(),

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

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

        mVtDataUsageUidSnapshot = vtDataUsageUidSnapshot;