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

Commit 7fa99e49 authored by Aaron Huang's avatar Aaron Huang
Browse files

Use new APIs to register/unregister network policy listener 

For mainline support, remove usage of INetworkPolicyManager from
DcTracker. Use SubscriptionListener which be created a proxy
object in NetworkPolicyManger to register/unregister network
policy listener.

Bug: 138306002
Test: atest FrameworksNetTests
      atest FrameworksTelephonyTests

Change-Id: I1f191d36901001bd91218a19ee5d775cacdddff2
Merged-In: I1f191d36901001bd91218a19ee5d775cacdddff2
parent 6f004714

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;
@@ -447,8 +446,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;
@@ -748,8 +747,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();
@@ -864,7 +864,7 @@ public class DcTracker extends Handler { 


        mSubscriptionManager

                .removeOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener);

        mNetworkPolicyManager.unregisterListener(mNetworkPolicyListener);

        mNetworkPolicyManager.unregisterSubscriptionCallback(mSubscriptionCallback);

        mDcc.dispose();

        mDcTesterFailBringUpAll.dispose();