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

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

Merge "Renamed DataSpecificRegistrationState" 

am: 0f84c2df

Change-Id: I2cd0a0ce1ed3c0d8904239ad0764c3ba72c7328a
parents 3b51ff1b 0f84c2df

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

+6 −6
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ import android.telephony.CellIdentityTdscdma; 
import android.telephony.CellIdentityWcdma;

import android.telephony.CellInfo;

import android.telephony.CellLocation;

import android.telephony.DataSpecificRegistrationStates;

import android.telephony.DataSpecificRegistrationInfo;

import android.telephony.NetworkRegistrationInfo;

import android.telephony.PhysicalChannelConfig;

import android.telephony.Rlog;
@@ -71,7 +71,7 @@ import android.telephony.SignalStrength; 
import android.telephony.SubscriptionManager;

import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;

import android.telephony.TelephonyManager;

import android.telephony.VoiceSpecificRegistrationStates;

import android.telephony.VoiceSpecificRegistrationInfo;

import android.telephony.cdma.CdmaCellLocation;

import android.telephony.gsm.GsmCellLocation;

import android.text.TextUtils;
@@ -2007,8 +2007,8 @@ public class ServiceStateTracker extends Handler { 
        switch (what) {

            case EVENT_POLL_STATE_CS_CELLULAR_REGISTRATION: {

                NetworkRegistrationInfo networkRegState = (NetworkRegistrationInfo) ar.result;

                VoiceSpecificRegistrationStates voiceSpecificStates =

                        networkRegState.getVoiceSpecificStates();

                VoiceSpecificRegistrationInfo voiceSpecificStates =

                        networkRegState.getVoiceSpecificInfo();



                int registrationState = networkRegState.getRegistrationState();

                int cssIndicator = voiceSpecificStates.cssSupported ? 1 : 0;
@@ -2096,8 +2096,8 @@ public class ServiceStateTracker extends Handler { 
            case EVENT_POLL_STATE_PS_CELLULAR_REGISTRATION: {

                NetworkRegistrationInfo networkRegState = (NetworkRegistrationInfo) ar.result;

                mNewSS.addNetworkRegistrationInfo(networkRegState);

                DataSpecificRegistrationStates dataSpecificStates =

                        networkRegState.getDataSpecificStates();

                DataSpecificRegistrationInfo dataSpecificStates =

                        networkRegState.getDataSpecificInfo();

                int registrationState = networkRegState.getRegistrationState();

                int serviceState = regCodeToServiceState(registrationState);

                int newDataRat = ServiceState.networkTypeToRilRadioTechnology(

tests/telephonytests/src/com/android/internal/telephony/ServiceStateTrackerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -1869,7 +1869,7 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
                sst.mSS.getNetworkRegistrationInfo(NetworkRegistrationInfo.DOMAIN_PS,

                        AccessNetworkConstants.TRANSPORT_TYPE_WWAN);

        assertEquals(lteVopsSupportInfo,

                sSnetworkRegistrationInfo.getDataSpecificStates().getLteVopsSupportInfo());

                sSnetworkRegistrationInfo.getDataSpecificInfo().getLteVopsSupportInfo());



        lteVopsSupportInfo =

                new LteVopsSupportInfo(LteVopsSupportInfo.LTE_STATUS_SUPPORTED,
@@ -1888,6 +1888,6 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
        sSnetworkRegistrationInfo =

                sst.mSS.getNetworkRegistrationInfo(2, 1);

        assertEquals(lteVopsSupportInfo,

                sSnetworkRegistrationInfo.getDataSpecificStates().getLteVopsSupportInfo());

                sSnetworkRegistrationInfo.getDataSpecificInfo().getLteVopsSupportInfo());

    }

}