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

Commit 41ba5ce4 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Rename constant OVERRIDE_* to SUBSCRIPTION_OVERRIDE_*" am: 9783ecda am: 504928f0 

Change-Id: Id945ece4e238ea19f7f203789e9bacae41893ede
parents 5dcae06a 504928f0

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

+4 −4
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


package com.android.internal.telephony.dataconnection;



import static android.net.NetworkPolicyManager.OVERRIDE_CONGESTED;

import static android.net.NetworkPolicyManager.OVERRIDE_UNMETERED;

import static android.net.NetworkPolicyManager.SUBSCRIPTION_OVERRIDE_CONGESTED;

import static android.net.NetworkPolicyManager.SUBSCRIPTION_OVERRIDE_UNMETERED;



import android.annotation.IntDef;

import android.annotation.Nullable;
@@ -1345,10 +1345,10 @@ public class DataConnection extends StateMachine { 
        result.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED);



        // Override values set above when requested by policy

        if ((mSubscriptionOverride & OVERRIDE_UNMETERED) != 0) {

        if ((mSubscriptionOverride & SUBSCRIPTION_OVERRIDE_UNMETERED) != 0) {

            result.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED);

        }

        if ((mSubscriptionOverride & OVERRIDE_CONGESTED) != 0) {

        if ((mSubscriptionOverride & SUBSCRIPTION_OVERRIDE_CONGESTED) != 0) {

            result.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED);

        }

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DataConnectionTest.java

+8 −6
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ package com.android.internal.telephony.dataconnection; 


import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED;

import static android.net.NetworkPolicyManager.OVERRIDE_CONGESTED;

import static android.net.NetworkPolicyManager.OVERRIDE_UNMETERED;

import static android.net.NetworkPolicyManager.SUBSCRIPTION_OVERRIDE_CONGESTED;

import static android.net.NetworkPolicyManager.SUBSCRIPTION_OVERRIDE_UNMETERED;



import static com.android.internal.telephony.TelephonyTestUtils.waitForMs;

import static com.android.internal.telephony.dataconnection.DcTrackerTest.FAKE_ADDRESS;
@@ -646,12 +646,13 @@ public class DataConnectionTest extends TelephonyTest { 
        assertFalse(getNetworkCapabilities().hasCapability(NET_CAPABILITY_NOT_METERED));

        assertTrue(getNetworkCapabilities().hasCapability(NET_CAPABILITY_NOT_CONGESTED));



        mDc.onSubscriptionOverride(OVERRIDE_UNMETERED, OVERRIDE_UNMETERED);

        mDc.onSubscriptionOverride(SUBSCRIPTION_OVERRIDE_UNMETERED,

                SUBSCRIPTION_OVERRIDE_UNMETERED);



        assertTrue(getNetworkCapabilities().hasCapability(NET_CAPABILITY_NOT_METERED));

        assertTrue(getNetworkCapabilities().hasCapability(NET_CAPABILITY_NOT_CONGESTED));



        mDc.onSubscriptionOverride(OVERRIDE_UNMETERED, 0);

        mDc.onSubscriptionOverride(SUBSCRIPTION_OVERRIDE_UNMETERED, 0);



        assertFalse(getNetworkCapabilities().hasCapability(NET_CAPABILITY_NOT_METERED));

        assertTrue(getNetworkCapabilities().hasCapability(NET_CAPABILITY_NOT_CONGESTED));
@@ -667,12 +668,13 @@ public class DataConnectionTest extends TelephonyTest { 
        assertFalse(getNetworkCapabilities().hasCapability(NET_CAPABILITY_NOT_METERED));

        assertTrue(getNetworkCapabilities().hasCapability(NET_CAPABILITY_NOT_CONGESTED));



        mDc.onSubscriptionOverride(OVERRIDE_CONGESTED, OVERRIDE_CONGESTED);

        mDc.onSubscriptionOverride(SUBSCRIPTION_OVERRIDE_CONGESTED,

                SUBSCRIPTION_OVERRIDE_CONGESTED);



        assertFalse(getNetworkCapabilities().hasCapability(NET_CAPABILITY_NOT_METERED));

        assertFalse(getNetworkCapabilities().hasCapability(NET_CAPABILITY_NOT_CONGESTED));



        mDc.onSubscriptionOverride(OVERRIDE_CONGESTED, 0);

        mDc.onSubscriptionOverride(SUBSCRIPTION_OVERRIDE_CONGESTED, 0);



        assertFalse(getNetworkCapabilities().hasCapability(NET_CAPABILITY_NOT_METERED));

        assertTrue(getNetworkCapabilities().hasCapability(NET_CAPABILITY_NOT_CONGESTED));