Merge "Use new APIs to register/unregister network policy listener" am: 5628673a

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;

    };

    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;

        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();

        mSubscriptionManager

                .removeOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener);

        mNetworkPolicyManager.unregisterListener(mNetworkPolicyListener);

        mNetworkPolicyManager.unregisterSubscriptionCallback(mSubscriptionCallback);

        mDcc.dispose();

        mDcTesterFailBringUpAll.dispose();