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

Commit 384b4455 authored by Cody Kesting's avatar Cody Kesting Committed by Gerrit Code Review
Browse files

Merge "Use updated VCN policy listener API."

parents ab604a06 1fb44688

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

+10 −8
Original line number Original line Diff line number Diff line
@@ -40,7 +40,7 @@ import android.net.RouteInfo; 
import android.net.SocketKeepalive;

import android.net.SocketKeepalive;

import android.net.TelephonyNetworkSpecifier;

import android.net.TelephonyNetworkSpecifier;

import android.net.vcn.VcnManager;

import android.net.vcn.VcnManager;

import android.net.vcn.VcnManager.VcnNetworkPolicyListener;

import android.net.vcn.VcnManager.VcnNetworkPolicyChangeListener;

import android.net.vcn.VcnNetworkPolicyResult;

import android.net.vcn.VcnNetworkPolicyResult;

import android.os.AsyncResult;

import android.os.AsyncResult;

import android.os.HandlerExecutor;

import android.os.HandlerExecutor;
@@ -334,8 +334,8 @@ public class DataConnection extends StateMachine { 
    PendingIntent mReconnectIntent = null;

    PendingIntent mReconnectIntent = null;





    /** Class used to track VCN-defined Network policies for this DcNetworkAgent. */

    /** Class used to track VCN-defined Network policies for this DcNetworkAgent. */

    private final VcnNetworkPolicyListener mVcnPolicyListener =

    private final VcnNetworkPolicyChangeListener mVcnPolicyChangeListener =

            new DataConnectionVcnNetworkPolicyListener();

            new DataConnectionVcnNetworkPolicyChangeListener();





    // ***** Event codes for driving the state machine, package visible for Dcc

    // ***** Event codes for driving the state machine, package visible for Dcc

    static final int BASE = Protocol.BASE_DATA_CONNECTION;

    static final int BASE = Protocol.BASE_DATA_CONNECTION;
@@ -2662,10 +2662,11 @@ public class DataConnection extends StateMachine { 
                        + ", mUnmeteredUseOnly = " + mUnmeteredUseOnly);

                        + ", mUnmeteredUseOnly = " + mUnmeteredUseOnly);

            }

            }





            // Always register a VcnNetworkPolicyListener, regardless of whether this is a handover

            // Always register a VcnNetworkPolicyChangeListener, regardless of whether this is a

            // handover

            // or new Network.

            // or new Network.

            mVcnManager.addVcnNetworkPolicyListener(

            mVcnManager.addVcnNetworkPolicyChangeListener(

                    new HandlerExecutor(getHandler()), mVcnPolicyListener);

                    new HandlerExecutor(getHandler()), mVcnPolicyChangeListener);





            if (mConnectionParams != null

            if (mConnectionParams != null

                    && mConnectionParams.mRequestType == REQUEST_TYPE_HANDOVER) {

                    && mConnectionParams.mRequestType == REQUEST_TYPE_HANDOVER) {
@@ -2784,7 +2785,7 @@ public class DataConnection extends StateMachine { 
                    mCid, mApnSetting.getApnTypeBitmask(), RilDataCall.State.DISCONNECTED);

                    mCid, mApnSetting.getApnTypeBitmask(), RilDataCall.State.DISCONNECTED);

            mDataCallSessionStats.onDataCallDisconnected();

            mDataCallSessionStats.onDataCallDisconnected();





            mVcnManager.removeVcnNetworkPolicyListener(mVcnPolicyListener);

            mVcnManager.removeVcnNetworkPolicyChangeListener(mVcnPolicyChangeListener);





            mPhone.getCarrierPrivilegesTracker().unregisterCarrierPrivilegesListener(getHandler());

            mPhone.getCarrierPrivilegesTracker().unregisterCarrierPrivilegesListener(getHandler());

        }

        }
@@ -3797,7 +3798,8 @@ public class DataConnection extends StateMachine { 
     *

     *

     * <p>MUST be registered with the associated DataConnection's Handler.

     * <p>MUST be registered with the associated DataConnection's Handler.

     */

     */

    private class DataConnectionVcnNetworkPolicyListener implements VcnNetworkPolicyListener {

    private class DataConnectionVcnNetworkPolicyChangeListener

            implements VcnNetworkPolicyChangeListener {

        @Override

        @Override

        public void onPolicyChanged() {

        public void onPolicyChanged() {

            // Poll the current underlying Network policy from VcnManager and send to NetworkAgent.

            // Poll the current underlying Network policy from VcnManager and send to NetworkAgent.