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

Commit 572f1524 authored by Amit Mahajan's avatar Amit Mahajan Committed by Android (Google) Code Review
Browse files

Merge changes from topics "npm-add-rm-listener-api", "rename-override-constants" 

* changes:
  Use new APIs to register/unregister network policy listener
  Rename constant OVERRIDE_* to SUBSCRIPTION_OVERRIDE_*
parents 7aa7098c cf2126f8

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;
@@ -1343,10 +1343,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);

        }

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

+6 −6
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import android.content.res.Resources; 
import android.database.ContentObserver;

import android.database.Cursor;

import android.net.ConnectivityManager;

import android.net.INetworkPolicyListener;

import android.net.LinkProperties;

import android.net.NetworkAgent;

import android.net.NetworkCapabilities;
@@ -428,8 +427,8 @@ public class DcTracker extends Handler { 
    };



    private NetworkPolicyManager mNetworkPolicyManager;

    private final INetworkPolicyListener mNetworkPolicyListener =

            new NetworkPolicyManager.Listener() {

    private final NetworkPolicyManager.SubscriptionCallback mSubscriptionCallback =

            new NetworkPolicyManager.SubscriptionCallback() {

        @Override

        public void onSubscriptionOverride(int subId, int overrideMask, int overrideValue) {

            if (mPhone == null || mPhone.getSubId() != subId) return;
@@ -729,8 +728,9 @@ public class DcTracker extends Handler { 
        mSubscriptionManager = SubscriptionManager.from(mPhone.getContext());

        mSubscriptionManager.addOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener);



        mNetworkPolicyManager = NetworkPolicyManager.from(mPhone.getContext());

        mNetworkPolicyManager.registerListener(mNetworkPolicyListener);

        mNetworkPolicyManager = (NetworkPolicyManager) mPhone.getContext()

                .getSystemService(Context.NETWORK_POLICY_SERVICE);

        mNetworkPolicyManager.registerSubscriptionCallback(mSubscriptionCallback);



        HandlerThread dcHandlerThread = new HandlerThread("DcHandlerThread");

        dcHandlerThread.start();
@@ -845,7 +845,7 @@ public class DcTracker extends Handler { 


        mSubscriptionManager

                .removeOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener);

        mNetworkPolicyManager.unregisterListener(mNetworkPolicyListener);

        mNetworkPolicyManager.unregisterSubscriptionCallback(mSubscriptionCallback);

        mDcc.dispose();

        mDcTesterFailBringUpAll.dispose();

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;
@@ -651,12 +651,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));
@@ -672,12 +673,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));