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

Commit 90b30bdf 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: ea8beb52 am: 0475a791 

Change-Id: Ia1cfffbf9ea1ff936ad47dbb87ff7f0f8c1b14bb
parents 5de9e228 0475a791

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
@@ -2617,7 +2617,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();