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

Commit 2b510ee8 authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Moved transport to IntDef" am: c81c3275 

am: 39be47a5

Change-Id: I790725192c343ef70eaf9a03a8643776ced305f0
parents ea76bb61 39be47a5

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

+3 −3
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ import android.os.Handler; 
import android.os.HandlerThread;

import android.os.Looper;

import android.os.Message;

import android.telephony.AccessNetworkConstants;

import android.telephony.AccessNetworkConstants.AccessNetworkType;

import android.telephony.AccessNetworkConstants.TransportType;

import android.telephony.CellIdentity;

import android.telephony.CellIdentityCdma;

import android.telephony.CellIdentityGsm;
@@ -210,7 +210,7 @@ public class CellularNetworkService extends NetworkService { 
        }



        private NetworkRegistrationState createRegistrationStateFromVoiceRegState(Object result) {

            int transportType = TransportType.WWAN;

            int transportType = AccessNetworkConstants.TRANSPORT_TYPE_WWAN;

            int domain = NetworkRegistrationState.DOMAIN_CS;



            if (result instanceof android.hardware.radio.V1_0.VoiceRegStateResult) {
@@ -260,7 +260,7 @@ public class CellularNetworkService extends NetworkService { 


        private NetworkRegistrationState createRegistrationStateFromDataRegState(Object result) {

            int domain = NetworkRegistrationState.DOMAIN_PS;

            int transportType = TransportType.WWAN;

            int transportType = AccessNetworkConstants.TRANSPORT_TYPE_WWAN;



            if (result instanceof android.hardware.radio.V1_0.DataRegStateResult) {

                android.hardware.radio.V1_0.DataRegStateResult dataRegState =

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

+8 −7
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ import android.provider.Settings; 
import android.provider.Telephony;

import android.telecom.TelecomManager;

import android.telecom.VideoProfile;

import android.telephony.AccessNetworkConstants.TransportType;

import android.telephony.AccessNetworkConstants;

import android.telephony.CarrierConfigManager;

import android.telephony.CellLocation;

import android.telephony.ImsiEncryptionInfo;
@@ -626,8 +626,8 @@ public class GsmCdmaPhone extends Phone { 
        DataActivityState ret = DataActivityState.NONE;



        if (mSST.getCurrentDataConnectionState() == ServiceState.STATE_IN_SERVICE

                && getDcTracker(TransportType.WWAN) != null) {

            switch (getDcTracker(TransportType.WWAN).getActivity()) {

                && getDcTracker(AccessNetworkConstants.TRANSPORT_TYPE_WWAN) != null) {

            switch (getDcTracker(AccessNetworkConstants.TRANSPORT_TYPE_WWAN).getActivity()) {

                case DATAIN:

                    ret = DataActivityState.DATAIN;

                break;
@@ -2114,16 +2114,17 @@ public class GsmCdmaPhone extends Phone { 


    @Override

    public boolean getDataRoamingEnabled() {

        if (getDcTracker(TransportType.WWAN) != null) {

            return getDcTracker(TransportType.WWAN).getDataRoamingEnabled();

        if (getDcTracker(AccessNetworkConstants.TRANSPORT_TYPE_WWAN) != null) {

            return getDcTracker(AccessNetworkConstants.TRANSPORT_TYPE_WWAN).getDataRoamingEnabled();

        }

        return false;

    }



    @Override

    public void setDataRoamingEnabled(boolean enable) {

        if (getDcTracker(TransportType.WWAN) != null) {

            getDcTracker(TransportType.WWAN).setDataRoamingEnabledByUser(enable);

        if (getDcTracker(AccessNetworkConstants.TRANSPORT_TYPE_WWAN) != null) {

            getDcTracker(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)

                    .setDataRoamingEnabledByUser(enable);

        }

    }

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

+11 −7
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.os.PersistableBundle; 
import android.os.RegistrantList;

import android.os.RemoteException;

import android.os.UserHandle;

import android.telephony.AccessNetworkConstants;

import android.telephony.AccessNetworkConstants.TransportType;

import android.telephony.CarrierConfigManager;

import android.telephony.INetworkService;
@@ -85,11 +86,12 @@ public class NetworkRegistrationManager extends Handler { 
        }

    };



    public NetworkRegistrationManager(int transportType, Phone phone) {

    public NetworkRegistrationManager(@TransportType int transportType, Phone phone) {

        mTransportType = transportType;

        mPhone = phone;



        String tagSuffix = "-" + ((transportType == TransportType.WWAN) ? "C" : "I");

        String tagSuffix = "-" + ((transportType == AccessNetworkConstants.TRANSPORT_TYPE_WWAN)

                ? "C" : "I");

        if (TelephonyManager.getDefault().getPhoneCount() > 1) {

            tagSuffix += "-" + mPhone.getPhoneId();

        }
@@ -181,7 +183,8 @@ public class NetworkRegistrationManager extends Handler { 
        @Override

        public void onServiceConnected(ComponentName name, IBinder service) {

            logd("service " + name + " for transport "

                    + TransportType.toString(mTransportType) + " is now connected.");

                    + AccessNetworkConstants.transportTypeToString(mTransportType)

                    + " is now connected.");

            mINetworkService = INetworkService.Stub.asInterface(service);

            mDeathRecipient = new RegManagerDeathRecipient(name);

            try {
@@ -199,7 +202,8 @@ public class NetworkRegistrationManager extends Handler { 
        @Override

        public void onServiceDisconnected(ComponentName name) {

            logd("service " + name + " for transport "

                    + TransportType.toString(mTransportType) + " is now disconnected.");

                    + AccessNetworkConstants.transportTypeToString(mTransportType)

                    + " is now disconnected.");

            mTargetBindingPackageName = null;

            if (mINetworkService != null) {

                mINetworkService.asBinder().unlinkToDeath(mDeathRecipient, 0);
@@ -260,7 +264,7 @@ public class NetworkRegistrationManager extends Handler { 
            // We bind this as a foreground service because it is operating directly on the SIM,

            // and we do not want it subjected to power-savings restrictions while doing so.

            logd("Trying to bind " + getPackageName() + " for transport "

                    + TransportType.toString(mTransportType));

                    + AccessNetworkConstants.transportTypeToString(mTransportType));

            mServiceConnection = new NetworkServiceConnection();

            if (!mPhone.getContext().bindService(intent, mServiceConnection,

                    Context.BIND_AUTO_CREATE)) {
@@ -279,12 +283,12 @@ public class NetworkRegistrationManager extends Handler { 
        String carrierConfig;



        switch (mTransportType) {

            case TransportType.WWAN:

            case AccessNetworkConstants.TRANSPORT_TYPE_WWAN:

                resourceId = com.android.internal.R.string.config_wwan_network_service_package;

                carrierConfig = CarrierConfigManager

                        .KEY_CARRIER_NETWORK_SERVICE_WWAN_PACKAGE_OVERRIDE_STRING;

                break;

            case TransportType.WLAN:

            case AccessNetworkConstants.TRANSPORT_TYPE_WLAN:

                resourceId = com.android.internal.R.string.config_wlan_network_service_package;

                carrierConfig = CarrierConfigManager

                        .KEY_CARRIER_NETWORK_SERVICE_WLAN_PACKAGE_OVERRIDE_STRING;

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

+4 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ import android.os.WorkSource; 
import android.preference.PreferenceManager;

import android.provider.Settings;

import android.telecom.VideoProfile;

import android.telephony.AccessNetworkConstants.TransportType;

import android.telephony.AccessNetworkConstants;

import android.telephony.CarrierConfigManager;

import android.telephony.CarrierRestrictionRules;

import android.telephony.CellInfo;
@@ -2884,8 +2884,9 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
     * @return true if there is a matching DUN APN.

     */

    public boolean hasMatchedTetherApnSetting() {

        if (getDcTracker(TransportType.WWAN) != null) {

            return getDcTracker(TransportType.WWAN).hasMatchedTetherApnSetting();

        if (getDcTracker(AccessNetworkConstants.TRANSPORT_TYPE_WWAN) != null) {

            return getDcTracker(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)

                    .hasMatchedTetherApnSetting();

        }

        return false;

    }

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

+28 −22
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import android.os.UserHandle; 
import android.os.WorkSource;

import android.preference.PreferenceManager;

import android.provider.Settings;

import android.telephony.AccessNetworkConstants;

import android.telephony.AccessNetworkConstants.AccessNetworkType;

import android.telephony.AccessNetworkConstants.TransportType;

import android.telephony.CarrierConfigManager;
@@ -575,9 +576,9 @@ public class ServiceStateTracker extends Handler { 
                CarrierServiceStateTracker.CARRIER_EVENT_VOICE_REGISTRATION, null);

        registerForNetworkDetached(mCSST,

                CarrierServiceStateTracker.CARRIER_EVENT_VOICE_DEREGISTRATION, null);

        registerForDataConnectionAttached(TransportType.WWAN, mCSST,

        registerForDataConnectionAttached(AccessNetworkConstants.TRANSPORT_TYPE_WWAN, mCSST,

                CarrierServiceStateTracker.CARRIER_EVENT_DATA_REGISTRATION, null);

        registerForDataConnectionDetached(TransportType.WWAN, mCSST,

        registerForDataConnectionDetached(AccessNetworkConstants.TRANSPORT_TYPE_WWAN, mCSST,

                CarrierServiceStateTracker.CARRIER_EVENT_DATA_DEREGISTRATION, null);

        registerForImsCapabilityChanged(mCSST,

                CarrierServiceStateTracker.CARRIER_EVENT_IMS_CAPABILITIES_CHANGED, null);
@@ -1212,7 +1213,7 @@ public class ServiceStateTracker extends Handler { 
                ar = (AsyncResult) msg.obj;



                if (ar.exception == null) {

                    mRegStateManagers.get(TransportType.WWAN)

                    mRegStateManagers.get(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)

                            .getNetworkRegistrationState(NetworkRegistrationState.DOMAIN_CS,

                            obtainMessage(EVENT_GET_LOC_DONE, null));

                }
@@ -1863,7 +1864,7 @@ public class ServiceStateTracker extends Handler { 
        int newFrequencyRange = ServiceState.FREQUENCY_RANGE_UNKNOWN;



        if (physicalChannelConfigs != null) {

            DcTracker dcTracker = mPhone.getDcTracker(TransportType.WWAN);

            DcTracker dcTracker = mPhone.getDcTracker(AccessNetworkConstants.TRANSPORT_TYPE_WWAN);

            for (PhysicalChannelConfig config : physicalChannelConfigs) {

                if (isNrPhysicalChannelConfig(config)) {

                    // Update the frequency range of the NR parameters if there is an internet data
@@ -1932,9 +1933,9 @@ public class ServiceStateTracker extends Handler { 
     */

    private void combinePsRegistrationStates(ServiceState serviceState) {

        NetworkRegistrationState wlanPsRegState = serviceState.getNetworkRegistrationState(

                NetworkRegistrationState.DOMAIN_PS, TransportType.WLAN);

                NetworkRegistrationState.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WLAN);

        NetworkRegistrationState wwanPsRegState = serviceState.getNetworkRegistrationState(

                NetworkRegistrationState.DOMAIN_PS, TransportType.WWAN);

                NetworkRegistrationState.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);

        if (wlanPsRegState != null

                && wlanPsRegState.getAccessNetworkTechnology()

                == TelephonyManager.NETWORK_TYPE_IWLAN
@@ -2926,20 +2927,22 @@ public class ServiceStateTracker extends Handler { 
                mCi.getOperator(obtainMessage(EVENT_POLL_STATE_OPERATOR, mPollingContext));



                mPollingContext[0]++;

                mRegStateManagers.get(TransportType.WWAN).getNetworkRegistrationState(

                        NetworkRegistrationState.DOMAIN_PS,

                        obtainMessage(EVENT_POLL_STATE_PS_CELLULAR_REGISTRATION, mPollingContext));

                mRegStateManagers.get(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)

                        .getNetworkRegistrationState(NetworkRegistrationState.DOMAIN_PS,

                                obtainMessage(EVENT_POLL_STATE_PS_CELLULAR_REGISTRATION,

                                        mPollingContext));



                mPollingContext[0]++;

                mRegStateManagers.get(TransportType.WWAN)

                mRegStateManagers.get(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)

                        .getNetworkRegistrationState(NetworkRegistrationState.DOMAIN_CS,

                        obtainMessage(EVENT_POLL_STATE_CS_CELLULAR_REGISTRATION, mPollingContext));



                if (mRegStateManagers.get(TransportType.WLAN) != null) {

                if (mRegStateManagers.get(AccessNetworkConstants.TRANSPORT_TYPE_WLAN) != null) {

                    mPollingContext[0]++;

                    mRegStateManagers.get(TransportType.WLAN).getNetworkRegistrationState(

                            NetworkRegistrationState.DOMAIN_PS,

                            obtainMessage(EVENT_POLL_STATE_PS_IWLAN_REGISTRATION, mPollingContext));

                    mRegStateManagers.get(AccessNetworkConstants.TRANSPORT_TYPE_WLAN)

                            .getNetworkRegistrationState(NetworkRegistrationState.DOMAIN_PS,

                                    obtainMessage(EVENT_POLL_STATE_PS_IWLAN_REGISTRATION,

                                            mPollingContext));

                }



                if (mPhone.isPhoneTypeGsm()) {
@@ -3263,7 +3266,8 @@ public class ServiceStateTracker extends Handler { 
        }



        if (has4gHandoff) {

            mAttachedRegistrants.get(TransportType.WWAN).notifyRegistrants();

            mAttachedRegistrants.get(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)

                    .notifyRegistrants();

            shouldLogAttachedChange = true;

        }
@@ -4098,7 +4102,8 @@ public class ServiceStateTracker extends Handler { 
     * @param what what code of message when delivered

     * @param obj placed in Message.obj

     */

    public void registerForDataConnectionAttached(int transport, Handler h, int what, Object obj) {

    public void registerForDataConnectionAttached(@TransportType int transport, Handler h, int what,

                                                  Object obj) {

        Registrant r = new Registrant(h, what, obj);

        if (mAttachedRegistrants.get(transport) == null) {

            mAttachedRegistrants.put(transport, new RegistrantList());
@@ -4120,7 +4125,7 @@ public class ServiceStateTracker extends Handler { 
     * @param transport Transport type

     * @param h Handler to notify

     */

    public void unregisterForDataConnectionAttached(int transport, Handler h) {

    public void unregisterForDataConnectionAttached(@TransportType int transport, Handler h) {

        if (mAttachedRegistrants.get(transport) != null) {

            mAttachedRegistrants.get(transport).remove(h);

        }
@@ -4133,7 +4138,8 @@ public class ServiceStateTracker extends Handler { 
     * @param what what code of message when delivered

     * @param obj placed in Message.obj

     */

    public void registerForDataConnectionDetached(int transport, Handler h, int what, Object obj) {

    public void registerForDataConnectionDetached(@TransportType int transport, Handler h, int what,

                                                  Object obj) {

        Registrant r = new Registrant(h, what, obj);

        if (mDetachedRegistrants.get(transport) == null) {

            mDetachedRegistrants.put(transport, new RegistrantList());
@@ -4155,7 +4161,7 @@ public class ServiceStateTracker extends Handler { 
     * @param transport Transport type

     * @param h Handler to notify

     */

    public void unregisterForDataConnectionDetached(int transport, Handler h) {

    public void unregisterForDataConnectionDetached(@TransportType int transport, Handler h) {

        if (mDetachedRegistrants.get(transport) != null) {

            mDetachedRegistrants.get(transport).remove(h);

        }
@@ -4190,8 +4196,8 @@ public class ServiceStateTracker extends Handler { 
     * @param what what code of message when delivered

     * @param obj placed in Message.obj

     */

    public void registerForDataRegStateOrRatChanged(int transport, Handler h, int what,

                                                    Object obj) {

    public void registerForDataRegStateOrRatChanged(@TransportType int transport, Handler h,

                                                    int what, Object obj) {

        Registrant r = new Registrant(h, what, obj);

        if (mDataRegStateOrRatChangedRegistrants.get(transport) == null) {

            mDataRegStateOrRatChangedRegistrants.put(transport, new RegistrantList());
@@ -4206,7 +4212,7 @@ public class ServiceStateTracker extends Handler { 
     * @param transport Transport

     * @param h The handler

     */

    public void unregisterForDataRegStateOrRatChanged(int transport, Handler h) {

    public void unregisterForDataRegStateOrRatChanged(@TransportType int transport, Handler h) {

        if (mDataRegStateOrRatChangedRegistrants.get(transport) != null) {

            mDataRegStateOrRatChangedRegistrants.get(transport).remove(h);

        }