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

Commit ac45cce9 authored by Michele Berionne's avatar Michele Berionne Committed by Automerger Merge Worker
Browse files

Merge "Create a single instance of CarrierPrivilegesTracker" am: bc6f5ae3 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1742946

Change-Id: I601486669b1bb9117364e7f08e2e87f6241caf32
parents e139d19b bc6f5ae3

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+8 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import android.os.AsyncResult; 
import android.os.Build;

import android.os.Bundle;

import android.os.Handler;

import android.os.Looper;

import android.os.Message;

import android.os.PersistableBundle;

import android.os.PowerManager;
@@ -265,6 +266,7 @@ public class GsmCdmaPhone extends Phone { 
    private final SettingsObserver mSettingsObserver;



    private final ImsManagerFactory mImsManagerFactory;

    private final CarrierPrivilegesTracker mCarrierPrivilegesTracker;



    // Constructors
@@ -329,6 +331,7 @@ public class GsmCdmaPhone extends Phone { 


        mCarrierResolver = mTelephonyComponentFactory.inject(CarrierResolver.class.getName())

                .makeCarrierResolver(this);

        mCarrierPrivilegesTracker = new CarrierPrivilegesTracker(Looper.myLooper(), this, context);



        getCarrierActionAgent().registerForCarrierAction(

                CarrierActionAgent.CARRIER_ACTION_SET_METERED_APNS_ENABLED, this,
@@ -1051,6 +1054,11 @@ public class GsmCdmaPhone extends Phone { 
        return mCT.mRingingCall;

    }



    @Override

    public CarrierPrivilegesTracker getCarrierPrivilegesTracker() {

        return mCarrierPrivilegesTracker;

    }



    /**

     * ImsService reports "IN_SERVICE" for its voice registration state even if the device

     * has lost the physical link to the tower. This helper method merges the IMS and modem

src/java/com/android/internal/telephony/Phone.java

+1 −3
Original line number Diff line number Diff line
@@ -453,7 +453,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
    protected boolean mIsCarrierNrSupported = false;



    private boolean mUnitTestMode;

    private CarrierPrivilegesTracker mCarrierPrivilegesTracker = null;



    protected VoiceCallSessionStats mVoiceCallSessionStats;

    protected SmsStats mSmsStats;
@@ -614,7 +613,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
        mSimActivationTracker = mTelephonyComponentFactory

                .inject(SimActivationTracker.class.getName())

                .makeSimActivationTracker(this);

        mCarrierPrivilegesTracker = new CarrierPrivilegesTracker(mLooper, this, mContext);

        if (getPhoneType() != PhoneConstants.PHONE_TYPE_SIP) {

            mCi.registerForSrvccStateChanged(this, EVENT_SRVCC_STATE_CHANGED, null);

        }
@@ -4718,7 +4716,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 


    /** @hide */

    public CarrierPrivilegesTracker getCarrierPrivilegesTracker() {

        return mCarrierPrivilegesTracker;

        return null;

    }



    public boolean useSsOverIms(Message onComplete) {

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

+9 −3
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ import android.util.Pair; 
import android.util.TimeUtils;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.CarrierPrivilegesTracker;

import com.android.internal.telephony.CarrierSignalAgent;

import com.android.internal.telephony.DctConstants;

import com.android.internal.telephony.Phone;
@@ -2575,9 +2576,11 @@ public class DataConnection extends StateMachine { 
            // this connection are going away.

            mRestrictedNetworkOverride = shouldRestrictNetwork();



            mPhone.getCarrierPrivilegesTracker()

                    .registerCarrierPrivilegesListener(

            CarrierPrivilegesTracker carrierPrivTracker = mPhone.getCarrierPrivilegesTracker();

            if (carrierPrivTracker != null) {

                carrierPrivTracker.registerCarrierPrivilegesListener(

                            getHandler(), EVENT_CARRIER_PRIVILEGED_UIDS_CHANGED, null);

            }

            notifyDataConnectionState();

            mDataCallSessionStats.onSetupDataCall(apnTypeBitmask);

        }
@@ -2920,7 +2923,10 @@ public class DataConnection extends StateMachine { 


            mVcnManager.removeVcnNetworkPolicyChangeListener(mVcnPolicyChangeListener);



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

            CarrierPrivilegesTracker carrierPrivTracker = mPhone.getCarrierPrivilegesTracker();

            if (carrierPrivTracker != null) {

                carrierPrivTracker.unregisterCarrierPrivilegesListener(getHandler());

            }

        }



        @Override

src/java/com/android/internal/telephony/imsphone/ImsPhone.java

+6 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ import com.android.internal.telephony.CallFailCause; 
import com.android.internal.telephony.CallForwardInfo;

import com.android.internal.telephony.CallStateException;

import com.android.internal.telephony.CallTracker;

import com.android.internal.telephony.CarrierPrivilegesTracker;

import com.android.internal.telephony.CommandException;

import com.android.internal.telephony.CommandsInterface;

import com.android.internal.telephony.Connection;
@@ -627,6 +628,11 @@ public class ImsPhone extends ImsPhoneBase { 
        return mCT.isImsServiceReady();

    }



    @Override

    public CarrierPrivilegesTracker getCarrierPrivilegesTracker() {

        return mDefaultPhone.getCarrierPrivilegesTracker();

    }



    /**

     * Hold the currently active call, possibly unholding a currently held call.

     * @throws CallStateException