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

Commit 743b8d9c authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Switch dynamic not metered to temp not metered" into rvc-dev am:... 

Merge "Switch dynamic not metered to temp not metered" into rvc-dev am: ea8beb52 am: 0475a791 am: 90b30bdf am: 6e0265de

Change-Id: Ia0c508cea8d0e657bc99869561b9d433a8ca39c5
parents 45989785 6e0265de

src/java/com/android/internal/telephony/dataconnection/DcNetworkAgent.java

+3 −3
Original line number Diff line number Diff line
@@ -234,9 +234,9 @@ public class DcNetworkAgent extends NetworkAgent { 
                // only log metrics for DataConnection with NET_CAPABILITY_INTERNET

                if (mNetworkCapabilities == null

                        || networkCapabilities.hasCapability(

                                NetworkCapabilities.NET_CAPABILITY_NOT_METERED)

                                NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED)

                        != mNetworkCapabilities.hasCapability(

                                                NetworkCapabilities.NET_CAPABILITY_NOT_METERED)) {

                                NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED)) {

                    TelephonyMetrics.getInstance().writeNetworkCapabilitiesChangedEvent(

                            mPhone.getPhoneId(), networkCapabilities);

                }

src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java

+1 −1
Original line number Diff line number Diff line
@@ -2625,7 +2625,7 @@ public class TelephonyMetrics { 
            NetworkCapabilities networkCapabilities) {

        final NetworkCapabilitiesInfo caps = new NetworkCapabilitiesInfo();

        caps.isNetworkUnmetered = networkCapabilities.hasCapability(

                NetworkCapabilities.NET_CAPABILITY_NOT_METERED);

                NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED);



        TelephonyEvent event = new TelephonyEventBuilder(phoneId)

                .setNetworkCapabilities(caps).build();

tests/telephonytests/src/com/android/internal/telephony/metrics/TelephonyMetricsTest.java

+2 −2
Original line number Diff line number Diff line
@@ -313,10 +313,10 @@ public class TelephonyMetricsTest extends TelephonyTest { 
    @SmallTest

    public void testWriteNetworkCapabilitiesChangedEvent() throws Exception {

        NetworkCapabilities caps = new NetworkCapabilities();

        caps.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED);

        caps.addCapability(NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED);

        mMetrics.writeNetworkCapabilitiesChangedEvent(mPhone.getPhoneId(), caps);



        caps.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED);

        caps.removeCapability(NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED);

        mMetrics.writeNetworkCapabilitiesChangedEvent(mPhone.getPhoneId(), caps);



        TelephonyLog log = buildProto();