Merge "Renamed NetworkRegistrationState to NetworkRegistrationInfo"
diff --git a/src/java/com/android/internal/telephony/CellularNetworkService.java b/src/java/com/android/internal/telephony/CellularNetworkService.java
index 37f302c..20a95c6 100644
--- a/src/java/com/android/internal/telephony/CellularNetworkService.java
+++ b/src/java/com/android/internal/telephony/CellularNetworkService.java
@@ -32,7 +32,7 @@
import android.telephony.CellIdentityTdscdma;
import android.telephony.CellIdentityWcdma;
import android.telephony.LteVopsSupportInfo;
-import android.telephony.NetworkRegistrationState;
+import android.telephony.NetworkRegistrationInfo;
import android.telephony.NetworkService;
import android.telephony.NetworkServiceCallback;
import android.telephony.Rlog;
@@ -88,9 +88,9 @@
if (callback == null) return;
ar = (AsyncResult) message.obj;
int domain = (message.what == GET_CS_REGISTRATION_STATE_DONE)
- ? NetworkRegistrationState.DOMAIN_CS
- : NetworkRegistrationState.DOMAIN_PS;
- NetworkRegistrationState netState =
+ ? NetworkRegistrationInfo.DOMAIN_CS
+ : NetworkRegistrationInfo.DOMAIN_PS;
+ NetworkRegistrationInfo netState =
getRegistrationStateFromResult(ar.result, domain);
int resultCode;
@@ -102,18 +102,18 @@
try {
if (DBG) {
- log("Calling callback.onGetNetworkRegistrationStateComplete."
+ log("Calling callback.onGetNetworkRegistrationInfoComplete."
+ "resultCode = " + resultCode
+ ", netState = " + netState);
}
- callback.onGetNetworkRegistrationStateComplete(
+ callback.onGetNetworkRegistrationInfoComplete(
resultCode, netState);
} catch (Exception e) {
loge("Exception: " + e);
}
break;
case NETWORK_REGISTRATION_STATE_CHANGED:
- notifyNetworkRegistrationStateChanged();
+ notifyNetworkRegistrationInfoChanged();
break;
default:
return;
@@ -129,22 +129,22 @@
switch (halRegState) {
case RegState.NOT_REG_MT_NOT_SEARCHING_OP:
case RegState.NOT_REG_MT_NOT_SEARCHING_OP_EM:
- return NetworkRegistrationState.REG_STATE_NOT_REG_NOT_SEARCHING;
+ return NetworkRegistrationInfo.REG_STATE_NOT_REG_NOT_SEARCHING;
case RegState.REG_HOME:
- return NetworkRegistrationState.REG_STATE_HOME;
+ return NetworkRegistrationInfo.REG_STATE_HOME;
case RegState.NOT_REG_MT_SEARCHING_OP:
case RegState.NOT_REG_MT_SEARCHING_OP_EM:
- return NetworkRegistrationState.REG_STATE_NOT_REG_SEARCHING;
+ return NetworkRegistrationInfo.REG_STATE_NOT_REG_SEARCHING;
case RegState.REG_DENIED:
case RegState.REG_DENIED_EM:
- return NetworkRegistrationState.REG_STATE_DENIED;
+ return NetworkRegistrationInfo.REG_STATE_DENIED;
case RegState.UNKNOWN:
case RegState.UNKNOWN_EM:
- return NetworkRegistrationState.REG_STATE_UNKNOWN;
+ return NetworkRegistrationInfo.REG_STATE_UNKNOWN;
case RegState.REG_ROAMING:
- return NetworkRegistrationState.REG_STATE_ROAMING;
+ return NetworkRegistrationInfo.REG_STATE_ROAMING;
default:
- return NetworkRegistrationState.REG_STATE_NOT_REG_NOT_SEARCHING;
+ return NetworkRegistrationInfo.REG_STATE_NOT_REG_NOT_SEARCHING;
}
}
@@ -173,16 +173,16 @@
// Otherwise, certain services are available only if it's registered on home or roaming
// network.
if (emergencyOnly) {
- availableServices = new int[] {NetworkRegistrationState.SERVICE_TYPE_EMERGENCY};
- } else if (regState == NetworkRegistrationState.REG_STATE_ROAMING
- || regState == NetworkRegistrationState.REG_STATE_HOME) {
- if (domain == NetworkRegistrationState.DOMAIN_PS) {
- availableServices = new int[] {NetworkRegistrationState.SERVICE_TYPE_DATA};
- } else if (domain == NetworkRegistrationState.DOMAIN_CS) {
+ availableServices = new int[] {NetworkRegistrationInfo.SERVICE_TYPE_EMERGENCY};
+ } else if (regState == NetworkRegistrationInfo.REG_STATE_ROAMING
+ || regState == NetworkRegistrationInfo.REG_STATE_HOME) {
+ if (domain == NetworkRegistrationInfo.DOMAIN_PS) {
+ availableServices = new int[] {NetworkRegistrationInfo.SERVICE_TYPE_DATA};
+ } else if (domain == NetworkRegistrationInfo.DOMAIN_CS) {
availableServices = new int[] {
- NetworkRegistrationState.SERVICE_TYPE_VOICE,
- NetworkRegistrationState.SERVICE_TYPE_SMS,
- NetworkRegistrationState.SERVICE_TYPE_VIDEO
+ NetworkRegistrationInfo.SERVICE_TYPE_VOICE,
+ NetworkRegistrationInfo.SERVICE_TYPE_SMS,
+ NetworkRegistrationInfo.SERVICE_TYPE_VIDEO
};
}
}
@@ -194,24 +194,24 @@
return ServiceState.rilRadioTechnologyToNetworkType(rilRat);
}
- private NetworkRegistrationState getRegistrationStateFromResult(Object result, int domain) {
+ private NetworkRegistrationInfo getRegistrationStateFromResult(Object result, int domain) {
if (result == null) {
return null;
}
// TODO: unify when voiceRegStateResult and DataRegStateResult are unified.
- if (domain == NetworkRegistrationState.DOMAIN_CS) {
+ if (domain == NetworkRegistrationInfo.DOMAIN_CS) {
return createRegistrationStateFromVoiceRegState(result);
- } else if (domain == NetworkRegistrationState.DOMAIN_PS) {
+ } else if (domain == NetworkRegistrationInfo.DOMAIN_PS) {
return createRegistrationStateFromDataRegState(result);
} else {
return null;
}
}
- private NetworkRegistrationState createRegistrationStateFromVoiceRegState(Object result) {
+ private NetworkRegistrationInfo createRegistrationStateFromVoiceRegState(Object result) {
int transportType = AccessNetworkConstants.TRANSPORT_TYPE_WWAN;
- int domain = NetworkRegistrationState.DOMAIN_CS;
+ int domain = NetworkRegistrationInfo.DOMAIN_CS;
if (result instanceof android.hardware.radio.V1_0.VoiceRegStateResult) {
android.hardware.radio.V1_0.VoiceRegStateResult voiceRegState =
@@ -229,7 +229,7 @@
CellIdentity cellIdentity =
convertHalCellIdentityToCellIdentity(voiceRegState.cellIdentity);
- return new NetworkRegistrationState(domain, transportType, regState,
+ return new NetworkRegistrationInfo(domain, transportType, regState,
accessNetworkTechnology, reasonForDenial, emergencyOnly, availableServices,
cellIdentity, cssSupported, roamingIndicator, systemIsInPrl,
defaultRoamingIndicator);
@@ -249,7 +249,7 @@
CellIdentity cellIdentity =
convertHalCellIdentityToCellIdentity(voiceRegState.cellIdentity);
- return new NetworkRegistrationState(domain, transportType, regState,
+ return new NetworkRegistrationInfo(domain, transportType, regState,
accessNetworkTechnology, reasonForDenial, emergencyOnly, availableServices,
cellIdentity, cssSupported, roamingIndicator, systemIsInPrl,
defaultRoamingIndicator);
@@ -258,8 +258,8 @@
return null;
}
- private NetworkRegistrationState createRegistrationStateFromDataRegState(Object result) {
- int domain = NetworkRegistrationState.DOMAIN_PS;
+ private NetworkRegistrationInfo createRegistrationStateFromDataRegState(Object result) {
+ int domain = NetworkRegistrationInfo.DOMAIN_PS;
int transportType = AccessNetworkConstants.TRANSPORT_TYPE_WWAN;
if (result instanceof android.hardware.radio.V1_0.DataRegStateResult) {
@@ -276,7 +276,7 @@
LteVopsSupportInfo lteVopsSupportInfo =
new LteVopsSupportInfo(LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE,
LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE);
- return new NetworkRegistrationState(domain, transportType, regState,
+ return new NetworkRegistrationInfo(domain, transportType, regState,
accessNetworkTechnology, reasonForDenial, emergencyOnly, availableServices,
cellIdentity, maxDataCalls, false /* isDcNrRestricted */,
false /* isNrAvailable */, false /* isEnDcAvailable */, lteVopsSupportInfo);
@@ -295,7 +295,7 @@
LteVopsSupportInfo lteVopsSupportInfo =
new LteVopsSupportInfo(LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE,
LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE);
- return new NetworkRegistrationState(domain, transportType, regState,
+ return new NetworkRegistrationInfo(domain, transportType, regState,
accessNetworkTechnology, reasonForDenial, emergencyOnly, availableServices,
cellIdentity, maxDataCalls, false /* isDcNrRestricted */,
false /* isNrAvailable */, false /* isEnDcAvailable */, lteVopsSupportInfo);
@@ -324,7 +324,7 @@
LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE);
}
- return new NetworkRegistrationState(domain, transportType, regState,
+ return new NetworkRegistrationInfo(domain, transportType, regState,
accessNetworkTechnology, reasonForDenial, emergencyOnly, availableServices,
cellIdentity, maxDataCalls, nrIndicators.isDcNrRestricted,
nrIndicators.isNrAvailable, nrIndicators.isEndcAvailable,
@@ -460,21 +460,21 @@
}
@Override
- public void getNetworkRegistrationState(int domain, NetworkServiceCallback callback) {
- if (DBG) log("getNetworkRegistrationState for domain " + domain);
+ public void getNetworkRegistrationInfo(int domain, NetworkServiceCallback callback) {
+ if (DBG) log("getNetworkRegistrationInfo for domain " + domain);
Message message = null;
- if (domain == NetworkRegistrationState.DOMAIN_CS) {
+ if (domain == NetworkRegistrationInfo.DOMAIN_CS) {
message = Message.obtain(mHandler, GET_CS_REGISTRATION_STATE_DONE);
mCallbackMap.put(message, callback);
mPhone.mCi.getVoiceRegistrationState(message);
- } else if (domain == NetworkRegistrationState.DOMAIN_PS) {
+ } else if (domain == NetworkRegistrationInfo.DOMAIN_PS) {
message = Message.obtain(mHandler, GET_PS_REGISTRATION_STATE_DONE);
mCallbackMap.put(message, callback);
mPhone.mCi.getDataRegistrationState(message);
} else {
- loge("getNetworkRegistrationState invalid domain " + domain);
- callback.onGetNetworkRegistrationStateComplete(
+ loge("getNetworkRegistrationInfo invalid domain " + domain);
+ callback.onGetNetworkRegistrationInfoComplete(
NetworkServiceCallback.RESULT_ERROR_INVALID_ARG, null);
}
}
diff --git a/src/java/com/android/internal/telephony/NetworkRegistrationManager.java b/src/java/com/android/internal/telephony/NetworkRegistrationManager.java
index 0d8fc79..b5ce2db 100644
--- a/src/java/com/android/internal/telephony/NetworkRegistrationManager.java
+++ b/src/java/com/android/internal/telephony/NetworkRegistrationManager.java
@@ -35,7 +35,7 @@
import android.telephony.CarrierConfigManager;
import android.telephony.INetworkService;
import android.telephony.INetworkServiceCallback;
-import android.telephony.NetworkRegistrationState;
+import android.telephony.NetworkRegistrationInfo;
import android.telephony.NetworkService;
import android.telephony.Rlog;
import android.telephony.TelephonyManager;
@@ -127,24 +127,24 @@
return (mINetworkService != null) && (mINetworkService.asBinder().isBinderAlive());
}
- public void unregisterForNetworkRegistrationStateChanged(Handler h) {
+ public void unregisterForNetworkRegistrationInfoChanged(Handler h) {
mRegStateChangeRegistrants.remove(h);
}
- public void registerForNetworkRegistrationStateChanged(Handler h, int what, Object obj) {
- logd("registerForNetworkRegistrationStateChanged");
+ public void registerForNetworkRegistrationInfoChanged(Handler h, int what, Object obj) {
+ logd("registerForNetworkRegistrationInfoChanged");
mRegStateChangeRegistrants.addUnique(h, what, obj);
}
private final Map<NetworkRegStateCallback, Message> mCallbackTable = new Hashtable();
- public void getNetworkRegistrationState(@NetworkRegistrationState.Domain int domain,
- Message onCompleteMessage) {
+ public void getNetworkRegistrationInfo(@NetworkRegistrationInfo.Domain int domain,
+ Message onCompleteMessage) {
if (onCompleteMessage == null) return;
if (!isServiceConnected()) {
loge("service not connected. Domain = "
- + ((domain == NetworkRegistrationState.DOMAIN_CS) ? "CS" : "PS"));
+ + ((domain == NetworkRegistrationInfo.DOMAIN_CS) ? "CS" : "PS"));
onCompleteMessage.obj = new AsyncResult(onCompleteMessage.obj, null,
new IllegalStateException("Service not connected."));
onCompleteMessage.sendToTarget();
@@ -154,9 +154,9 @@
NetworkRegStateCallback callback = new NetworkRegStateCallback();
try {
mCallbackTable.put(callback, onCompleteMessage);
- mINetworkService.getNetworkRegistrationState(mPhone.getPhoneId(), domain, callback);
+ mINetworkService.getNetworkRegistrationInfo(mPhone.getPhoneId(), domain, callback);
} catch (RemoteException e) {
- loge("getNetworkRegistrationState RemoteException " + e);
+ loge("getNetworkRegistrationInfo RemoteException " + e);
mCallbackTable.remove(callback);
onCompleteMessage.obj = new AsyncResult(onCompleteMessage.obj, null, e);
onCompleteMessage.sendToTarget();
@@ -190,7 +190,7 @@
try {
service.linkToDeath(mDeathRecipient, 0);
mINetworkService.createNetworkServiceProvider(mPhone.getPhoneId());
- mINetworkService.registerForNetworkRegistrationStateChanged(mPhone.getPhoneId(),
+ mINetworkService.registerForNetworkRegistrationInfoChanged(mPhone.getPhoneId(),
new NetworkRegStateCallback());
} catch (RemoteException exception) {
// Remote exception means that the binder already died.
@@ -213,9 +213,9 @@
private class NetworkRegStateCallback extends INetworkServiceCallback.Stub {
@Override
- public void onGetNetworkRegistrationStateComplete(
- int result, NetworkRegistrationState state) {
- logd("onGetNetworkRegistrationStateComplete result "
+ public void onGetNetworkRegistrationInfoComplete(
+ int result, NetworkRegistrationInfo state) {
+ logd("onGetNetworkRegistrationInfoComplete result "
+ result + " state " + state);
Message onCompleteMessage = mCallbackTable.remove(this);
if (onCompleteMessage != null) {
diff --git a/src/java/com/android/internal/telephony/ServiceStateTracker.java b/src/java/com/android/internal/telephony/ServiceStateTracker.java
index 7a19788..9bde5be 100755
--- a/src/java/com/android/internal/telephony/ServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/ServiceStateTracker.java
@@ -63,7 +63,7 @@
import android.telephony.CellInfo;
import android.telephony.CellLocation;
import android.telephony.DataSpecificRegistrationStates;
-import android.telephony.NetworkRegistrationState;
+import android.telephony.NetworkRegistrationInfo;
import android.telephony.PhysicalChannelConfig;
import android.telephony.Rlog;
import android.telephony.ServiceState;
@@ -567,7 +567,7 @@
for (int transportType : mTransportManager.getAvailableTransports()) {
mRegStateManagers.append(transportType, new NetworkRegistrationManager(
transportType, phone));
- mRegStateManagers.get(transportType).registerForNetworkRegistrationStateChanged(
+ mRegStateManagers.get(transportType).registerForNetworkRegistrationInfoChanged(
this, EVENT_NETWORK_STATE_CHANGED, null);
}
mLocaleTracker = TelephonyComponentFactory.getInstance()
@@ -646,8 +646,8 @@
// If we are previously in service, we need to notify that we are out of service now.
for (int transport : mTransportManager.getAvailableTransports()) {
if (mSS != null) {
- NetworkRegistrationState nrs = mSS.getNetworkRegistrationState(
- NetworkRegistrationState.DOMAIN_PS, transport);
+ NetworkRegistrationInfo nrs = mSS.getNetworkRegistrationInfo(
+ NetworkRegistrationInfo.DOMAIN_PS, transport);
if (nrs != null && nrs.isInService()
&& mDetachedRegistrants.get(transport) != null) {
mDetachedRegistrants.get(transport).notifyRegistrants();
@@ -792,8 +792,8 @@
* new RAT as an Integer Object.
*/
protected void notifyDataRegStateRilRadioTechnologyChanged(int transport) {
- NetworkRegistrationState nrs = mSS.getNetworkRegistrationState(
- NetworkRegistrationState.DOMAIN_PS, transport);
+ NetworkRegistrationInfo nrs = mSS.getNetworkRegistrationInfo(
+ NetworkRegistrationInfo.DOMAIN_PS, transport);
if (nrs != null) {
int rat = ServiceState.networkTypeToRilRadioTechnology(
nrs.getAccessNetworkTechnology());
@@ -1181,7 +1181,7 @@
case EVENT_GET_LOC_DONE:
ar = (AsyncResult) msg.obj;
if (ar.exception == null) {
- CellIdentity cellIdentity = ((NetworkRegistrationState) ar.result)
+ CellIdentity cellIdentity = ((NetworkRegistrationInfo) ar.result)
.getCellIdentity();
mCellIdentity = cellIdentity;
mPhone.notifyLocationChanged(getCellLocation());
@@ -1258,7 +1258,7 @@
if (ar.exception == null) {
mRegStateManagers.get(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
- .getNetworkRegistrationState(NetworkRegistrationState.DOMAIN_CS,
+ .getNetworkRegistrationInfo(NetworkRegistrationInfo.DOMAIN_CS,
obtainMessage(EVENT_GET_LOC_DONE, null));
}
break;
@@ -1517,7 +1517,7 @@
updateNrFrequencyRangeFromPhysicalChannelConfigs(list, mSS);
hasChanged |= updateNrStatusFromPhysicalChannelConfigs(
list,
- mSS.getNetworkRegistrationState(NetworkRegistrationState.DOMAIN_PS,
+ mSS.getNetworkRegistrationInfo(NetworkRegistrationInfo.DOMAIN_PS,
AccessNetworkType.EUTRAN));
// Notify NR frequency, NR connection status or bandwidths changed.
@@ -1896,7 +1896,7 @@
}
private boolean isNrStatusChanged(
- NetworkRegistrationState oldRegState, NetworkRegistrationState newRegState) {
+ NetworkRegistrationInfo oldRegState, NetworkRegistrationInfo newRegState) {
if (oldRegState == null || newRegState == null) {
return oldRegState != newRegState;
}
@@ -1934,7 +1934,7 @@
}
private boolean updateNrStatusFromPhysicalChannelConfigs(
- List<PhysicalChannelConfig> configs, NetworkRegistrationState regState) {
+ List<PhysicalChannelConfig> configs, NetworkRegistrationInfo regState) {
if (regState == null || configs == null) return false;
@@ -1949,12 +1949,12 @@
int newNrStatus = regState.getNrStatus();
if (hasNrSecondaryServingCell) {
- if (regState.getNrStatus() == NetworkRegistrationState.NR_STATUS_NOT_RESTRICTED) {
- newNrStatus = NetworkRegistrationState.NR_STATUS_CONNECTED;
+ if (regState.getNrStatus() == NetworkRegistrationInfo.NR_STATUS_NOT_RESTRICTED) {
+ newNrStatus = NetworkRegistrationInfo.NR_STATUS_CONNECTED;
}
} else {
- if (regState.getNrStatus() == NetworkRegistrationState.NR_STATUS_CONNECTED) {
- newNrStatus = NetworkRegistrationState.NR_STATUS_NOT_RESTRICTED;
+ if (regState.getNrStatus() == NetworkRegistrationInfo.NR_STATUS_CONNECTED) {
+ newNrStatus = NetworkRegistrationInfo.NR_STATUS_NOT_RESTRICTED;
}
}
@@ -1977,14 +1977,14 @@
* @param serviceState The service state having combined registration states.
*/
private void combinePsRegistrationStates(ServiceState serviceState) {
- NetworkRegistrationState wlanPsRegState = serviceState.getNetworkRegistrationState(
- NetworkRegistrationState.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WLAN);
- NetworkRegistrationState wwanPsRegState = serviceState.getNetworkRegistrationState(
- NetworkRegistrationState.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
+ NetworkRegistrationInfo wlanPsRegState = serviceState.getNetworkRegistrationInfo(
+ NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WLAN);
+ NetworkRegistrationInfo wwanPsRegState = serviceState.getNetworkRegistrationInfo(
+ NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
if (wlanPsRegState != null
&& wlanPsRegState.getAccessNetworkTechnology()
== TelephonyManager.NETWORK_TYPE_IWLAN
- && wlanPsRegState.getRegState() == NetworkRegistrationState.REG_STATE_HOME) {
+ && wlanPsRegState.getRegState() == NetworkRegistrationInfo.REG_STATE_HOME) {
serviceState.setRilDataRadioTechnology(ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN);
serviceState.setDataRegState(ServiceState.STATE_IN_SERVICE);
} else if (wwanPsRegState != null) {
@@ -2005,7 +2005,7 @@
int ints[];
switch (what) {
case EVENT_POLL_STATE_CS_CELLULAR_REGISTRATION: {
- NetworkRegistrationState networkRegState = (NetworkRegistrationState) ar.result;
+ NetworkRegistrationInfo networkRegState = (NetworkRegistrationInfo) ar.result;
VoiceSpecificRegistrationStates voiceSpecificStates =
networkRegState.getVoiceSpecificStates();
@@ -2017,7 +2017,7 @@
mNewSS.setVoiceRegState(regCodeToServiceState(registrationState));
mNewSS.setCssIndicator(cssIndicator);
mNewSS.setRilVoiceRadioTechnology(newVoiceRat);
- mNewSS.addNetworkRegistrationState(networkRegState);
+ mNewSS.addNetworkRegistrationInfo(networkRegState);
setPhyCellInfoFromCellIdentity(mNewSS, networkRegState.getCellIdentity());
//Denial reason if registrationState = 3
@@ -2083,8 +2083,8 @@
}
case EVENT_POLL_STATE_PS_IWLAN_REGISTRATION: {
- NetworkRegistrationState networkRegState = (NetworkRegistrationState) ar.result;
- mNewSS.addNetworkRegistrationState(networkRegState);
+ NetworkRegistrationInfo networkRegState = (NetworkRegistrationInfo) ar.result;
+ mNewSS.addNetworkRegistrationInfo(networkRegState);
if (DBG) {
log("handlPollStateResultMessage: PS IWLAN. " + networkRegState);
@@ -2093,8 +2093,8 @@
}
case EVENT_POLL_STATE_PS_CELLULAR_REGISTRATION: {
- NetworkRegistrationState networkRegState = (NetworkRegistrationState) ar.result;
- mNewSS.addNetworkRegistrationState(networkRegState);
+ NetworkRegistrationInfo networkRegState = (NetworkRegistrationInfo) ar.result;
+ mNewSS.addNetworkRegistrationInfo(networkRegState);
DataSpecificRegistrationStates dataSpecificStates =
networkRegState.getDataSpecificStates();
int registrationState = networkRegState.getRegState();
@@ -2980,19 +2980,19 @@
mPollingContext[0]++;
mRegStateManagers.get(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
- .getNetworkRegistrationState(NetworkRegistrationState.DOMAIN_PS,
+ .getNetworkRegistrationInfo(NetworkRegistrationInfo.DOMAIN_PS,
obtainMessage(EVENT_POLL_STATE_PS_CELLULAR_REGISTRATION,
mPollingContext));
mPollingContext[0]++;
mRegStateManagers.get(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
- .getNetworkRegistrationState(NetworkRegistrationState.DOMAIN_CS,
+ .getNetworkRegistrationInfo(NetworkRegistrationInfo.DOMAIN_CS,
obtainMessage(EVENT_POLL_STATE_CS_CELLULAR_REGISTRATION, mPollingContext));
if (mRegStateManagers.get(AccessNetworkConstants.TRANSPORT_TYPE_WLAN) != null) {
mPollingContext[0]++;
mRegStateManagers.get(AccessNetworkConstants.TRANSPORT_TYPE_WLAN)
- .getNetworkRegistrationState(NetworkRegistrationState.DOMAIN_PS,
+ .getNetworkRegistrationInfo(NetworkRegistrationInfo.DOMAIN_PS,
obtainMessage(EVENT_POLL_STATE_PS_IWLAN_REGISTRATION,
mPollingContext));
}
@@ -3050,10 +3050,10 @@
boolean anyDataRegChanged = false;
boolean anyDataRatChanged = false;
for (int transport : mTransportManager.getAvailableTransports()) {
- NetworkRegistrationState oldNrs = mSS.getNetworkRegistrationState(
- NetworkRegistrationState.DOMAIN_PS, transport);
- NetworkRegistrationState newNrs = mNewSS.getNetworkRegistrationState(
- NetworkRegistrationState.DOMAIN_PS, transport);
+ NetworkRegistrationInfo oldNrs = mSS.getNetworkRegistrationInfo(
+ NetworkRegistrationInfo.DOMAIN_PS, transport);
+ NetworkRegistrationInfo newNrs = mNewSS.getNetworkRegistrationInfo(
+ NetworkRegistrationInfo.DOMAIN_PS, transport);
boolean changed = (oldNrs == null || !oldNrs.isInService())
&& (newNrs != null && newNrs.isInService());
@@ -3073,9 +3073,9 @@
}
int oldRegState = oldNrs != null ? oldNrs.getRegState()
- : NetworkRegistrationState.REG_STATE_UNKNOWN;
+ : NetworkRegistrationInfo.REG_STATE_UNKNOWN;
int newRegState = newNrs != null ? newNrs.getRegState()
- : NetworkRegistrationState.REG_STATE_UNKNOWN;
+ : NetworkRegistrationInfo.REG_STATE_UNKNOWN;
hasDataRegStateChanged.put(transport, oldRegState != newRegState);
if (oldRegState != newRegState) {
anyDataRegChanged = true;
@@ -3089,10 +3089,10 @@
mSS.getNrFrequencyRange() != mNewSS.getNrFrequencyRange();
boolean hasNrStatusChanged = isNrStatusChanged(
- mSS.getNetworkRegistrationState(
- NetworkRegistrationState.DOMAIN_PS, AccessNetworkType.EUTRAN),
- mNewSS.getNetworkRegistrationState(
- NetworkRegistrationState.DOMAIN_PS, AccessNetworkType.EUTRAN));
+ mSS.getNetworkRegistrationInfo(
+ NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkType.EUTRAN),
+ mNewSS.getNetworkRegistrationInfo(
+ NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkType.EUTRAN));
// TODO: loosen this restriction to exempt fields that are provided through system
// information; otherwise, we will get false positives when things like the operator
@@ -3578,8 +3578,8 @@
* to service state */
private int regCodeToServiceState(int code) {
switch (code) {
- case NetworkRegistrationState.REG_STATE_HOME:
- case NetworkRegistrationState.REG_STATE_ROAMING:
+ case NetworkRegistrationInfo.REG_STATE_HOME:
+ case NetworkRegistrationInfo.REG_STATE_ROAMING:
return ServiceState.STATE_IN_SERVICE;
default:
return ServiceState.STATE_OUT_OF_SERVICE;
@@ -3591,7 +3591,7 @@
* returns true if registered roam, false otherwise
*/
private boolean regCodeIsRoaming (int code) {
- return NetworkRegistrationState.REG_STATE_ROAMING == code;
+ return NetworkRegistrationInfo.REG_STATE_ROAMING == code;
}
private boolean isSameOperatorNameFromSimAndSS(ServiceState s) {
@@ -4168,8 +4168,8 @@
mAttachedRegistrants.get(transport).add(r);
if (mSS != null) {
- NetworkRegistrationState netRegState = mSS.getNetworkRegistrationState(
- NetworkRegistrationState.DOMAIN_PS, transport);
+ NetworkRegistrationInfo netRegState = mSS.getNetworkRegistrationInfo(
+ NetworkRegistrationInfo.DOMAIN_PS, transport);
if (netRegState == null || netRegState.isInService()) {
r.notifyRegistrant();
}
@@ -4204,8 +4204,8 @@
mDetachedRegistrants.get(transport).add(r);
if (mSS != null) {
- NetworkRegistrationState netRegState = mSS.getNetworkRegistrationState(
- NetworkRegistrationState.DOMAIN_PS, transport);
+ NetworkRegistrationInfo netRegState = mSS.getNetworkRegistrationInfo(
+ NetworkRegistrationInfo.DOMAIN_PS, transport);
if (netRegState != null && !netRegState.isInService()) {
r.notifyRegistrant();
}
diff --git a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
index 5a8d085..5b635fa 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
@@ -46,7 +46,7 @@
import android.telephony.AccessNetworkConstants;
import android.telephony.AccessNetworkConstants.TransportType;
import android.telephony.DataFailCause;
-import android.telephony.NetworkRegistrationState;
+import android.telephony.NetworkRegistrationInfo;
import android.telephony.Rlog;
import android.telephony.ServiceState;
import android.telephony.TelephonyManager;
@@ -2878,7 +2878,7 @@
/** Check if the device is connected to NR 5G Non-Standalone network. */
private boolean isNRConnected() {
return mPhone.getServiceState().getNrStatus()
- == NetworkRegistrationState.NR_STATUS_CONNECTED;
+ == NetworkRegistrationInfo.NR_STATUS_CONNECTED;
}
private void dumpToLog() {
diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
index 226a914..51a6b6d 100755
--- a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
@@ -70,7 +70,7 @@
import android.telephony.CarrierConfigManager;
import android.telephony.CellLocation;
import android.telephony.DataFailCause;
-import android.telephony.NetworkRegistrationState;
+import android.telephony.NetworkRegistrationInfo;
import android.telephony.PcoData;
import android.telephony.Rlog;
import android.telephony.ServiceState;
@@ -4794,8 +4794,8 @@
private int getDataRat() {
ServiceState ss = mPhone.getServiceState();
- NetworkRegistrationState nrs = ss.getNetworkRegistrationState(
- NetworkRegistrationState.DOMAIN_PS, mTransportType);
+ NetworkRegistrationInfo nrs = ss.getNetworkRegistrationInfo(
+ NetworkRegistrationInfo.DOMAIN_PS, mTransportType);
if (nrs != null) {
return ServiceState.networkTypeToRilRadioTechnology(nrs.getAccessNetworkTechnology());
}
diff --git a/src/java/com/android/internal/telephony/test/SimulatedCommands.java b/src/java/com/android/internal/telephony/test/SimulatedCommands.java
index 5bdf169..9fdc20c 100644
--- a/src/java/com/android/internal/telephony/test/SimulatedCommands.java
+++ b/src/java/com/android/internal/telephony/test/SimulatedCommands.java
@@ -40,7 +40,7 @@
import android.telephony.CellSignalStrengthWcdma;
import android.telephony.IccOpenLogicalChannelResponse;
import android.telephony.ImsiEncryptionInfo;
-import android.telephony.NetworkRegistrationState;
+import android.telephony.NetworkRegistrationInfo;
import android.telephony.NetworkScanRequest;
import android.telephony.Rlog;
import android.telephony.ServiceState;
@@ -128,9 +128,9 @@
int mNetworkType;
String mPin2Code;
boolean mSsnNotifyOn = false;
- private int mVoiceRegState = NetworkRegistrationState.REG_STATE_HOME;
+ private int mVoiceRegState = NetworkRegistrationInfo.REG_STATE_HOME;
private int mVoiceRadioTech = ServiceState.RIL_RADIO_TECHNOLOGY_UMTS;
- private int mDataRegState = NetworkRegistrationState.REG_STATE_HOME;
+ private int mDataRegState = NetworkRegistrationInfo.REG_STATE_HOME;
private int mDataRadioTech = ServiceState.RIL_RADIO_TECHNOLOGY_UMTS;
public boolean mCssSupported;
public int mRoamingIndicator;
diff --git a/tests/telephonytests/src/com/android/internal/telephony/CellularNetworkServiceTest.java b/tests/telephonytests/src/com/android/internal/telephony/CellularNetworkServiceTest.java
index 918b705..01b92fb 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/CellularNetworkServiceTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/CellularNetworkServiceTest.java
@@ -31,7 +31,7 @@
import android.telephony.INetworkService;
import android.telephony.INetworkServiceCallback;
import android.telephony.LteVopsSupportInfo;
-import android.telephony.NetworkRegistrationState;
+import android.telephony.NetworkRegistrationInfo;
import android.telephony.NetworkService;
import android.telephony.NetworkServiceCallback;
import android.telephony.ServiceState;
@@ -92,12 +92,12 @@
@Test
@MediumTest
- public void testGetNetworkRegistrationState() {
- int voiceRegState = NetworkRegistrationState.REG_STATE_HOME;
- int dataRegState = NetworkRegistrationState.REG_STATE_HOME;
+ public void testGetNetworkRegistrationInfo() {
+ int voiceRegState = NetworkRegistrationInfo.REG_STATE_HOME;
+ int dataRegState = NetworkRegistrationInfo.REG_STATE_HOME;
int voiceRadioTech = ServiceState.RIL_RADIO_TECHNOLOGY_HSPA;
int dataRadioTech = ServiceState.RIL_RADIO_TECHNOLOGY_HSPA;
- int domain = NetworkRegistrationState.DOMAIN_CS;
+ int domain = NetworkRegistrationInfo.DOMAIN_CS;
boolean cssSupported = true;
int roamingIndicator = 1;
@@ -106,9 +106,9 @@
int reasonForDenial = 0;
int maxDataCalls = 4;
int[] availableServices = new int[] {
- NetworkRegistrationState.SERVICE_TYPE_VOICE,
- NetworkRegistrationState.SERVICE_TYPE_SMS,
- NetworkRegistrationState.SERVICE_TYPE_VIDEO
+ NetworkRegistrationInfo.SERVICE_TYPE_VOICE,
+ NetworkRegistrationInfo.SERVICE_TYPE_SMS,
+ NetworkRegistrationInfo.SERVICE_TYPE_VIDEO
};
mSimulatedCommands.setVoiceRegState(voiceRegState);
@@ -125,30 +125,30 @@
mSimulatedCommands.notifyNetworkStateChanged();
try {
- mBinder.getNetworkRegistrationState(0, domain, mCallback);
+ mBinder.getNetworkRegistrationInfo(0, domain, mCallback);
} catch (RemoteException e) {
assertTrue(false);
}
waitForMs(1000);
- NetworkRegistrationState expectedState = new NetworkRegistrationState(
+ NetworkRegistrationInfo expectedState = new NetworkRegistrationInfo(
domain, AccessNetworkConstants.TRANSPORT_TYPE_WWAN, voiceRegState,
ServiceState.rilRadioTechnologyToNetworkType(voiceRadioTech), reasonForDenial,
false, availableServices, null, cssSupported,
roamingIndicator, systemIsInPrl, defaultRoamingIndicator);
try {
- verify(mCallback, times(1)).onGetNetworkRegistrationStateComplete(
+ verify(mCallback, times(1)).onGetNetworkRegistrationInfoComplete(
eq(NetworkServiceCallback.RESULT_SUCCESS), eq(expectedState));
} catch (RemoteException e) {
assertTrue(false);
}
- domain = NetworkRegistrationState.DOMAIN_PS;
- availableServices = new int[] {NetworkRegistrationState.SERVICE_TYPE_DATA};
+ domain = NetworkRegistrationInfo.DOMAIN_PS;
+ availableServices = new int[] {NetworkRegistrationInfo.SERVICE_TYPE_DATA};
try {
- mBinder.getNetworkRegistrationState(0, domain, mCallback);
+ mBinder.getNetworkRegistrationInfo(0, domain, mCallback);
} catch (RemoteException e) {
assertTrue(false);
}
@@ -159,14 +159,14 @@
new LteVopsSupportInfo(LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE,
LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE);
- expectedState = new NetworkRegistrationState(
+ expectedState = new NetworkRegistrationInfo(
domain, AccessNetworkConstants.TRANSPORT_TYPE_WWAN, voiceRegState,
ServiceState.rilRadioTechnologyToNetworkType(voiceRadioTech), reasonForDenial,
false, availableServices, null, maxDataCalls, false, false, false,
lteVopsSupportInfo);
try {
- verify(mCallback, times(1)).onGetNetworkRegistrationStateComplete(
+ verify(mCallback, times(1)).onGetNetworkRegistrationInfoComplete(
eq(NetworkServiceCallback.RESULT_SUCCESS), eq(expectedState));
} catch (RemoteException e) {
assertTrue(false);
diff --git a/tests/telephonytests/src/com/android/internal/telephony/NetworkRegistrationStateTest.java b/tests/telephonytests/src/com/android/internal/telephony/NetworkRegistrationInfoTest.java
similarity index 72%
rename from tests/telephonytests/src/com/android/internal/telephony/NetworkRegistrationStateTest.java
rename to tests/telephonytests/src/com/android/internal/telephony/NetworkRegistrationInfoTest.java
index 636bbc5..9655403 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/NetworkRegistrationStateTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/NetworkRegistrationInfoTest.java
@@ -21,34 +21,34 @@
import android.os.Parcel;
import android.telephony.AccessNetworkConstants;
import android.telephony.CellIdentityLte;
-import android.telephony.NetworkRegistrationState;
+import android.telephony.NetworkRegistrationInfo;
import android.telephony.TelephonyManager;
import androidx.test.filters.SmallTest;
import org.junit.Test;
-/** Unit tests for {@link NetworkRegistrationState}. */
-public class NetworkRegistrationStateTest {
+/** Unit tests for {@link NetworkRegistrationInfo}. */
+public class NetworkRegistrationInfoTest {
@Test
@SmallTest
public void testParcel() {
- NetworkRegistrationState nrs = new NetworkRegistrationState(
- NetworkRegistrationState.DOMAIN_CS,
+ NetworkRegistrationInfo nrs = new NetworkRegistrationInfo(
+ NetworkRegistrationInfo.DOMAIN_CS,
AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
- NetworkRegistrationState.REG_STATE_HOME,
+ NetworkRegistrationInfo.REG_STATE_HOME,
TelephonyManager.NETWORK_TYPE_LTE,
0,
false,
- new int[]{NetworkRegistrationState.SERVICE_TYPE_DATA},
+ new int[]{NetworkRegistrationInfo.SERVICE_TYPE_DATA},
new CellIdentityLte());
Parcel p = Parcel.obtain();
nrs.writeToParcel(p, 0);
p.setDataPosition(0);
- NetworkRegistrationState newNrs = NetworkRegistrationState.CREATOR.createFromParcel(p);
+ NetworkRegistrationInfo newNrs = NetworkRegistrationInfo.CREATOR.createFromParcel(p);
assertEquals(nrs, newNrs);
}
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/ServiceStateTest.java b/tests/telephonytests/src/com/android/internal/telephony/ServiceStateTest.java
index dd40f7f..573d286 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/ServiceStateTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/ServiceStateTest.java
@@ -20,7 +20,7 @@
import android.os.Parcel;
import android.telephony.AccessNetworkConstants;
import android.telephony.LteVopsSupportInfo;
-import android.telephony.NetworkRegistrationState;
+import android.telephony.NetworkRegistrationInfo;
import android.telephony.ServiceState;
import android.telephony.TelephonyManager;
import android.test.suitebuilder.annotation.SmallTest;
@@ -37,9 +37,9 @@
public void testRoaming() {
ServiceState ss = new ServiceState();
// add data registration state
- ss.addNetworkRegistrationState(new NetworkRegistrationState(
- NetworkRegistrationState.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
- NetworkRegistrationState.REG_STATE_ROAMING,
+ ss.addNetworkRegistrationInfo(new NetworkRegistrationInfo(
+ NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
+ NetworkRegistrationInfo.REG_STATE_ROAMING,
TelephonyManager.NETWORK_TYPE_UNKNOWN, 0,
false, null, null));
assertTrue(ss.getDataRoamingFromRegistration());
@@ -283,43 +283,43 @@
}
@SmallTest
- public void testNetworkRegistrationState() {
- NetworkRegistrationState wwanVoiceRegState = new NetworkRegistrationState(
- NetworkRegistrationState.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
+ public void testNetworkRegistrationInfo() {
+ NetworkRegistrationInfo wwanVoiceRegState = new NetworkRegistrationInfo(
+ NetworkRegistrationInfo.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
0, 0, 0, false,
null, null, true, 0, 0, 0);
LteVopsSupportInfo lteVopsSupportInfo =
new LteVopsSupportInfo(LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE,
LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE);
- NetworkRegistrationState wwanDataRegState = new NetworkRegistrationState(
- NetworkRegistrationState.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
+ NetworkRegistrationInfo wwanDataRegState = new NetworkRegistrationInfo(
+ NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
0, 0, 0, false, null, null, 0, false, false, false,
lteVopsSupportInfo);
- NetworkRegistrationState wlanRegState = new NetworkRegistrationState(
- NetworkRegistrationState.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WLAN,
+ NetworkRegistrationInfo wlanRegState = new NetworkRegistrationInfo(
+ NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WLAN,
0, 0, 0, false,
null, null);
ServiceState ss = new ServiceState();
- ss.addNetworkRegistrationState(wwanVoiceRegState);
- ss.addNetworkRegistrationState(wwanDataRegState);
- ss.addNetworkRegistrationState(wlanRegState);
+ ss.addNetworkRegistrationInfo(wwanVoiceRegState);
+ ss.addNetworkRegistrationInfo(wwanDataRegState);
+ ss.addNetworkRegistrationInfo(wlanRegState);
- assertEquals(ss.getNetworkRegistrationStates(NetworkRegistrationState.DOMAIN_CS,
+ assertEquals(ss.getNetworkRegistrationInfo(NetworkRegistrationInfo.DOMAIN_CS,
AccessNetworkConstants.TRANSPORT_TYPE_WWAN), wwanVoiceRegState);
- assertEquals(ss.getNetworkRegistrationStates(NetworkRegistrationState.DOMAIN_PS,
+ assertEquals(ss.getNetworkRegistrationInfo(NetworkRegistrationInfo.DOMAIN_PS,
AccessNetworkConstants.TRANSPORT_TYPE_WWAN), wwanDataRegState);
- assertEquals(ss.getNetworkRegistrationStates(NetworkRegistrationState.DOMAIN_PS,
+ assertEquals(ss.getNetworkRegistrationInfo(NetworkRegistrationInfo.DOMAIN_PS,
AccessNetworkConstants.TRANSPORT_TYPE_WLAN), wlanRegState);
- wwanDataRegState = new NetworkRegistrationState(
- NetworkRegistrationState.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
+ wwanDataRegState = new NetworkRegistrationInfo(
+ NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
0, 0, 0, true, null, null, 0, false, false, false, lteVopsSupportInfo);
- ss.addNetworkRegistrationState(wwanDataRegState);
- assertEquals(ss.getNetworkRegistrationStates(NetworkRegistrationState.DOMAIN_PS,
+ ss.addNetworkRegistrationInfo(wwanDataRegState);
+ assertEquals(ss.getNetworkRegistrationInfo(NetworkRegistrationInfo.DOMAIN_PS,
AccessNetworkConstants.TRANSPORT_TYPE_WWAN), wwanDataRegState);
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/ServiceStateTrackerTest.java b/tests/telephonytests/src/com/android/internal/telephony/ServiceStateTrackerTest.java
index 4742279..061bd04 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/ServiceStateTrackerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/ServiceStateTrackerTest.java
@@ -74,7 +74,7 @@
import android.telephony.CellSignalStrengthWcdma;
import android.telephony.INetworkService;
import android.telephony.LteVopsSupportInfo;
-import android.telephony.NetworkRegistrationState;
+import android.telephony.NetworkRegistrationInfo;
import android.telephony.NetworkService;
import android.telephony.PhysicalChannelConfig;
import android.telephony.ServiceState;
@@ -211,9 +211,9 @@
// UMTS < GPRS < EDGE
new String[]{"3,1,2"});
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_HOME);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_HOME);
mSimulatedCommands.setVoiceRadioTech(ServiceState.RIL_RADIO_TECHNOLOGY_HSPA);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_HOME);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_HOME);
mSimulatedCommands.setDataRadioTech(ServiceState.RIL_RADIO_TECHNOLOGY_HSPA);
int dds = SubscriptionManager.getDefaultDataSubscriptionId();
@@ -647,9 +647,9 @@
public void testGsmCellLocation() {
CellIdentityGsm cellIdentityGsm = new CellIdentityGsm(
2, 3, 900, 5, "001", "01", "test", "tst");
- NetworkRegistrationState result = new NetworkRegistrationState(
- NetworkRegistrationState.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
- NetworkRegistrationState.REG_STATE_HOME, 0, 0, false, null,
+ NetworkRegistrationInfo result = new NetworkRegistrationInfo(
+ NetworkRegistrationInfo.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
+ NetworkRegistrationInfo.REG_STATE_HOME, 0, 0, false, null,
cellIdentityGsm);
sst.sendMessage(sst.obtainMessage(ServiceStateTracker.EVENT_GET_LOC_DONE,
@@ -668,9 +668,9 @@
// TODO(nharold): we probably should remove support for this procedure (GET_LOC)
public void testCdmaCellLocation() {
CellIdentityCdma cellIdentityCdma = new CellIdentityCdma(1, 2, 3, 4, 5, "test", "tst");
- NetworkRegistrationState result = new NetworkRegistrationState(
- NetworkRegistrationState.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
- NetworkRegistrationState.REG_STATE_HOME, 0, 0, false, null, cellIdentityCdma);
+ NetworkRegistrationInfo result = new NetworkRegistrationInfo(
+ NetworkRegistrationInfo.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
+ NetworkRegistrationInfo.REG_STATE_HOME, 0, 0, false, null, cellIdentityCdma);
sst.sendMessage(sst.obtainMessage(ServiceStateTracker.EVENT_GET_LOC_DONE,
new AsyncResult(null, result, null)));
@@ -733,8 +733,8 @@
// Enable roaming and trigger events to notify handler registered
doReturn(true).when(mPhone).isPhoneTypeGsm();
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_ROAMING);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_ROAMING);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(200);
@@ -745,8 +745,8 @@
assertEquals(EVENT_DATA_ROAMING_ON, messageArgumentCaptor.getValue().what);
// Disable roaming
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_HOME);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_HOME);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_HOME);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_HOME);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(100);
@@ -755,8 +755,8 @@
sst.unregisterForVoiceRoamingOn(mTestHandler);
// Enable roaming
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_ROAMING);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_ROAMING);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(200);
@@ -770,8 +770,8 @@
public void testRegAndUnregForVoiceRoamingOff() throws Exception {
// Enable roaming
doReturn(true).when(mPhone).isPhoneTypeGsm();
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_ROAMING);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_ROAMING);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(100);
@@ -780,8 +780,8 @@
// Disable roaming
doReturn(true).when(mPhone).isPhoneTypeGsm();
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_HOME);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_HOME);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_HOME);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_HOME);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(200);
@@ -792,8 +792,8 @@
assertEquals(EVENT_DATA_ROAMING_OFF, messageArgumentCaptor.getValue().what);
// Enable roaming
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_ROAMING);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_ROAMING);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(100);
@@ -802,8 +802,8 @@
sst.unregisterForVoiceRoamingOff(mTestHandler);
// Disable roaming
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_HOME);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_HOME);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_HOME);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_HOME);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(100);
@@ -819,8 +819,8 @@
// Enable roaming and trigger events to notify handler registered
doReturn(true).when(mPhone).isPhoneTypeGsm();
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_ROAMING);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_ROAMING);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(200);
@@ -831,8 +831,8 @@
assertEquals(EVENT_DATA_ROAMING_ON, messageArgumentCaptor.getValue().what);
// Disable roaming
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_HOME);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_HOME);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_HOME);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_HOME);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(100);
@@ -841,8 +841,8 @@
sst.unregisterForDataRoamingOn(mTestHandler);
// Enable roaming
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_ROAMING);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_ROAMING);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(200);
@@ -856,8 +856,8 @@
public void testRegAndUnregForDataRoamingOff() throws Exception {
// Enable roaming
doReturn(true).when(mPhone).isPhoneTypeGsm();
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_ROAMING);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_ROAMING);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(100);
@@ -866,8 +866,8 @@
// Disable roaming
doReturn(true).when(mPhone).isPhoneTypeGsm();
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_HOME);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_HOME);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_HOME);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_HOME);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(100);
@@ -878,8 +878,8 @@
assertEquals(EVENT_DATA_ROAMING_OFF, messageArgumentCaptor.getValue().what);
// Enable roaming
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_ROAMING);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_ROAMING);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(100);
@@ -888,8 +888,8 @@
sst.unregisterForDataRoamingOff(mTestHandler);
// Disable roaming
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_HOME);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_HOME);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_HOME);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_HOME);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(100);
@@ -913,8 +913,8 @@
mTestHandler, EVENT_DATA_CONNECTION_ATTACHED, null);
// set service state in service and trigger events to post message on handler
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_ROAMING);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_ROAMING);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(200);
@@ -936,8 +936,8 @@
mTestHandler);
// set service state in service
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_ROAMING);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_ROAMING);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(100);
@@ -951,8 +951,8 @@
public void testRegAndUnregForDataConnAttach() throws Exception {
// Initially set service state out of service
doReturn(true).when(mPhone).isPhoneTypeGsm();
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_UNKNOWN);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_UNKNOWN);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_UNKNOWN);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_UNKNOWN);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(100);
@@ -961,8 +961,8 @@
mTestHandler, EVENT_DATA_CONNECTION_ATTACHED, null);
// set service state in service and trigger events to post message on handler
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_ROAMING);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_ROAMING);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(200);
@@ -973,8 +973,8 @@
assertEquals(EVENT_DATA_CONNECTION_ATTACHED, messageArgumentCaptor.getValue().what);
// set service state out of service
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_UNKNOWN);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_UNKNOWN);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_UNKNOWN);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_UNKNOWN);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(100);
@@ -984,8 +984,8 @@
mTestHandler);
// set service state in service
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_ROAMING);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_ROAMING);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(100);
@@ -999,16 +999,16 @@
public void testRegAndUnregForDataConnDetach() throws Exception {
// Initially set service state in service
doReturn(true).when(mPhone).isPhoneTypeGsm();
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_ROAMING);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_ROAMING);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
mSimulatedCommands.notifyNetworkStateChanged();
sst.registerForDataConnectionDetached(AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
mTestHandler, EVENT_DATA_CONNECTION_DETACHED, null);
// set service state out of service and trigger events to post message on handler
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_UNKNOWN);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_UNKNOWN);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_UNKNOWN);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_UNKNOWN);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(200);
@@ -1019,8 +1019,8 @@
assertEquals(EVENT_DATA_CONNECTION_DETACHED, messageArgumentCaptor.getValue().what);
// set service state in service
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_ROAMING);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_ROAMING);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(100);
@@ -1030,8 +1030,8 @@
mTestHandler);
// set service state out of service
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_UNKNOWN);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_UNKNOWN);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_UNKNOWN);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_UNKNOWN);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(100);
@@ -1043,7 +1043,7 @@
@Test
@MediumTest
public void testRegisterForVoiceRegStateOrRatChange() {
- int vrs = NetworkRegistrationState.REG_STATE_HOME;
+ int vrs = NetworkRegistrationInfo.REG_STATE_HOME;
int vrat = sst.mSS.RIL_RADIO_TECHNOLOGY_LTE;
sst.mSS.setRilVoiceRadioTechnology(vrat);
sst.mSS.setVoiceRegState(vrs);
@@ -1062,13 +1062,13 @@
@Test
@MediumTest
public void testRegisterForDataRegStateOrRatChange() {
- NetworkRegistrationState nrs = new NetworkRegistrationState.Builder()
- .setDomain(NetworkRegistrationState.DOMAIN_PS)
+ NetworkRegistrationInfo nrs = new NetworkRegistrationInfo.Builder()
+ .setDomain(NetworkRegistrationInfo.DOMAIN_PS)
.setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
.setAccessNetworkTechnology(TelephonyManager.NETWORK_TYPE_LTE)
- .setRegState(NetworkRegistrationState.REG_STATE_HOME)
+ .setRegState(NetworkRegistrationInfo.REG_STATE_HOME)
.build();
- sst.mSS.addNetworkRegistrationState(nrs);
+ sst.mSS.addNetworkRegistrationInfo(nrs);
sst.registerForDataRegStateOrRatChanged(AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
mTestHandler, EVENT_DATA_RAT_CHANGED, null);
@@ -1089,8 +1089,8 @@
public void testRegAndUnregForNetworkAttached() throws Exception {
// Initially set service state out of service
doReturn(true).when(mPhone).isPhoneTypeGsm();
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_UNKNOWN);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_UNKNOWN);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_UNKNOWN);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_UNKNOWN);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(100);
@@ -1098,8 +1098,8 @@
sst.registerForNetworkAttached(mTestHandler, EVENT_REGISTERED_TO_NETWORK, null);
// set service state in service and trigger events to post message on handler
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_ROAMING);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_ROAMING);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(100);
@@ -1110,8 +1110,8 @@
assertEquals(EVENT_REGISTERED_TO_NETWORK, messageArgumentCaptor.getValue().what);
// set service state out of service
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_UNKNOWN);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_UNKNOWN);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_UNKNOWN);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_UNKNOWN);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(100);
@@ -1120,8 +1120,8 @@
sst.unregisterForNetworkAttached(mTestHandler);
// set service state in service
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_ROAMING);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_ROAMING);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(100);
@@ -1144,8 +1144,8 @@
sst.registerForNetworkAttached(mTestHandler, EVENT_REGISTERED_TO_NETWORK, null);
// set service state in service and trigger events to post message on handler
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_ROAMING);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_ROAMING);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(100);
@@ -1171,8 +1171,8 @@
sst.registerForNetworkAttached(mTestHandler, EVENT_REGISTERED_TO_NETWORK, null);
// set service state in service
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_ROAMING);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_ROAMING);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(100);
@@ -1432,8 +1432,8 @@
// Enable roaming
doReturn(true).when(mPhone).isPhoneTypeGsm();
- mSimulatedCommands.setVoiceRegState(NetworkRegistrationState.REG_STATE_ROAMING);
- mSimulatedCommands.setDataRegState(NetworkRegistrationState.REG_STATE_ROAMING);
+ mSimulatedCommands.setVoiceRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
+ mSimulatedCommands.setDataRegState(NetworkRegistrationInfo.REG_STATE_ROAMING);
mSimulatedCommands.notifyNetworkStateChanged();
waitForMs(200);
@@ -1590,8 +1590,8 @@
LteVopsSupportInfo lteVopsSupportInfo =
new LteVopsSupportInfo(LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE,
LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE);
- NetworkRegistrationState dataResult = new NetworkRegistrationState(
- NetworkRegistrationState.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
+ NetworkRegistrationInfo dataResult = new NetworkRegistrationInfo(
+ NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
state, dataRat, 0, false,
null, cid, 1, false, false, false, lteVopsSupportInfo);
sst.mPollingContext[0] = 2;
@@ -1600,8 +1600,8 @@
ServiceStateTracker.EVENT_POLL_STATE_PS_CELLULAR_REGISTRATION,
new AsyncResult(sst.mPollingContext, dataResult, null)));
waitForMs(200);
- NetworkRegistrationState voiceResult = new NetworkRegistrationState(
- NetworkRegistrationState.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
+ NetworkRegistrationInfo voiceResult = new NetworkRegistrationInfo(
+ NetworkRegistrationInfo.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
state, voiceRat, 0, false,
null, cid, false, 0, 0, 0);
sst.sendMessage(sst.obtainMessage(
@@ -1690,13 +1690,13 @@
LteVopsSupportInfo lteVopsSupportInfo =
new LteVopsSupportInfo(LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE,
LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE);
- NetworkRegistrationState dataResult = new NetworkRegistrationState(
- NetworkRegistrationState.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
- NetworkRegistrationState.REG_STATE_HOME, TelephonyManager.NETWORK_TYPE_LTE, 0,
+ NetworkRegistrationInfo dataResult = new NetworkRegistrationInfo(
+ NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
+ NetworkRegistrationInfo.REG_STATE_HOME, TelephonyManager.NETWORK_TYPE_LTE, 0,
false, null, cellId, 1, false, false, false, lteVopsSupportInfo);
- NetworkRegistrationState voiceResult = new NetworkRegistrationState(
- NetworkRegistrationState.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
- NetworkRegistrationState.REG_STATE_HOME, TelephonyManager.NETWORK_TYPE_LTE, 0,
+ NetworkRegistrationInfo voiceResult = new NetworkRegistrationInfo(
+ NetworkRegistrationInfo.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
+ NetworkRegistrationInfo.REG_STATE_HOME, TelephonyManager.NETWORK_TYPE_LTE, 0,
false, null, cellId, false, 0, 0, 0);
sst.mPollingContext[0] = 2;
// update data reg state to be in service
@@ -1761,14 +1761,14 @@
LteVopsSupportInfo lteVopsSupportInfo =
new LteVopsSupportInfo(LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE,
LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE);
- NetworkRegistrationState dataResult = new NetworkRegistrationState(
- NetworkRegistrationState.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
- NetworkRegistrationState.REG_STATE_NOT_REG_NOT_SEARCHING,
+ NetworkRegistrationInfo dataResult = new NetworkRegistrationInfo(
+ NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
+ NetworkRegistrationInfo.REG_STATE_NOT_REG_NOT_SEARCHING,
TelephonyManager.NETWORK_TYPE_UNKNOWN, 0, false, null, null, 1, false, false,
false, lteVopsSupportInfo);
- NetworkRegistrationState voiceResult = new NetworkRegistrationState(
- NetworkRegistrationState.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
- NetworkRegistrationState.REG_STATE_NOT_REG_NOT_SEARCHING,
+ NetworkRegistrationInfo voiceResult = new NetworkRegistrationInfo(
+ NetworkRegistrationInfo.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
+ NetworkRegistrationInfo.REG_STATE_NOT_REG_NOT_SEARCHING,
TelephonyManager.NETWORK_TYPE_UNKNOWN, 0, false, null, null, false, 0, 0, 0);
sst.mPollingContext[0] = 2;
sst.sendMessage(sst.obtainMessage(
@@ -1838,18 +1838,18 @@
new LteVopsSupportInfo(LteVopsSupportInfo.LTE_STATUS_NOT_SUPPORTED,
LteVopsSupportInfo.LTE_STATUS_NOT_SUPPORTED);
- NetworkRegistrationState dataResult = new NetworkRegistrationState(
- NetworkRegistrationState.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
- NetworkRegistrationState.REG_STATE_HOME, TelephonyManager.NETWORK_TYPE_LTE, 0,
+ NetworkRegistrationInfo dataResult = new NetworkRegistrationInfo(
+ NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
+ NetworkRegistrationInfo.REG_STATE_HOME, TelephonyManager.NETWORK_TYPE_LTE, 0,
false, null, cellId, 1, false, false, false, lteVopsSupportInfo);
sst.mPollingContext[0] = 2;
sst.sendMessage(sst.obtainMessage(
ServiceStateTracker.EVENT_POLL_STATE_PS_CELLULAR_REGISTRATION,
new AsyncResult(sst.mPollingContext, dataResult, null)));
- NetworkRegistrationState voiceResult = new NetworkRegistrationState(
- NetworkRegistrationState.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
- NetworkRegistrationState.REG_STATE_HOME, TelephonyManager.NETWORK_TYPE_LTE, 0,
+ NetworkRegistrationInfo voiceResult = new NetworkRegistrationInfo(
+ NetworkRegistrationInfo.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
+ NetworkRegistrationInfo.REG_STATE_HOME, TelephonyManager.NETWORK_TYPE_LTE, 0,
false, null, cellId, false, 0, 0, 0);
sst.sendMessage(sst.obtainMessage(
ServiceStateTracker.EVENT_POLL_STATE_CS_CELLULAR_REGISTRATION,
@@ -1857,17 +1857,17 @@
waitForMs(200);
assertEquals(ServiceState.STATE_IN_SERVICE, sst.getCurrentDataConnectionState());
- NetworkRegistrationState sSnetworkRegistrationState =
- sst.mSS.getNetworkRegistrationState(NetworkRegistrationState.DOMAIN_PS,
+ NetworkRegistrationInfo sSnetworkRegistrationInfo =
+ sst.mSS.getNetworkRegistrationInfo(NetworkRegistrationInfo.DOMAIN_PS,
AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
assertEquals(lteVopsSupportInfo,
- sSnetworkRegistrationState.getDataSpecificStates().getLteVopsSupportInfo());
+ sSnetworkRegistrationInfo.getDataSpecificStates().getLteVopsSupportInfo());
lteVopsSupportInfo =
new LteVopsSupportInfo(LteVopsSupportInfo.LTE_STATUS_SUPPORTED,
LteVopsSupportInfo.LTE_STATUS_NOT_SUPPORTED);
- dataResult = new NetworkRegistrationState(NetworkRegistrationState.DOMAIN_PS,
- AccessNetworkConstants.TRANSPORT_TYPE_WWAN, NetworkRegistrationState.REG_STATE_HOME,
+ dataResult = new NetworkRegistrationInfo(NetworkRegistrationInfo.DOMAIN_PS,
+ AccessNetworkConstants.TRANSPORT_TYPE_WWAN, NetworkRegistrationInfo.REG_STATE_HOME,
TelephonyManager.NETWORK_TYPE_LTE, 0, false, null, cellId, 1, false, false, false,
lteVopsSupportInfo);
sst.mPollingContext[0] = 1;
@@ -1876,9 +1876,9 @@
new AsyncResult(sst.mPollingContext, dataResult, null)));
waitForMs(200);
- sSnetworkRegistrationState =
- sst.mSS.getNetworkRegistrationState(2, 1);
+ sSnetworkRegistrationInfo =
+ sst.mSS.getNetworkRegistrationInfo(2, 1);
assertEquals(lteVopsSupportInfo,
- sSnetworkRegistrationState.getDataSpecificStates().getLteVopsSupportInfo());
+ sSnetworkRegistrationInfo.getDataSpecificStates().getLteVopsSupportInfo());
}
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java b/tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java
index 62b26ce..febe11d 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java
@@ -45,7 +45,7 @@
import android.provider.BlockedNumberContract;
import android.provider.Settings;
import android.telephony.AccessNetworkConstants;
-import android.telephony.NetworkRegistrationState;
+import android.telephony.NetworkRegistrationInfo;
import android.telephony.ServiceState;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
@@ -144,7 +144,7 @@
@Mock
protected ServiceState mServiceState;
@Mock
- protected NetworkRegistrationState mNetworkRegistrationState;
+ protected NetworkRegistrationInfo mNetworkRegistrationInfo;
@Mock
protected SimulatedCommandsVerifier mSimulatedCommandsVerifier;
@Mock
@@ -496,7 +496,7 @@
.getCurrentTransport(anyInt());
doReturn(true).when(mDataEnabledSettings).isDataEnabled();
doReturn(true).when(mDataEnabledSettings).isInternalDataEnabled();
- doReturn(mNetworkRegistrationState).when(mServiceState).getNetworkRegistrationState(
+ doReturn(mNetworkRegistrationInfo).when(mServiceState).getNetworkRegistrationInfo(
anyInt(), anyInt());
doReturn(new HalVersion(1, 4)).when(mPhone).getHalVersion();
diff --git a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java
index 27eae4a..c1aee8c 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java
@@ -429,7 +429,7 @@
doReturn("fake.action_attached").when(mPhone).getActionAttached();
doReturn(ServiceState.RIL_RADIO_TECHNOLOGY_LTE).when(mServiceState)
.getRilDataRadioTechnology();
- doReturn(TelephonyManager.NETWORK_TYPE_LTE).when(mNetworkRegistrationState)
+ doReturn(TelephonyManager.NETWORK_TYPE_LTE).when(mNetworkRegistrationInfo)
.getAccessNetworkTechnology();
mContextFixture.putStringArrayResource(com.android.internal.R.array.networkAttributes,
@@ -1145,7 +1145,7 @@
@SmallTest
public void testTrySetupDefaultOnIWLAN() throws Exception {
initApns(PhoneConstants.APN_TYPE_DEFAULT, new String[]{PhoneConstants.APN_TYPE_ALL});
- doReturn(TelephonyManager.NETWORK_TYPE_IWLAN).when(mNetworkRegistrationState)
+ doReturn(TelephonyManager.NETWORK_TYPE_IWLAN).when(mNetworkRegistrationInfo)
.getAccessNetworkTechnology();
mBundle.putStringArray(CarrierConfigManager.KEY_CARRIER_METERED_APN_TYPES_STRINGS,
@@ -1198,7 +1198,7 @@
@Test
@SmallTest
public void testUpdateWaitingApnListOnDataRatChange() throws Exception {
- doReturn(TelephonyManager.NETWORK_TYPE_EHRPD).when(mNetworkRegistrationState)
+ doReturn(TelephonyManager.NETWORK_TYPE_EHRPD).when(mNetworkRegistrationInfo)
.getAccessNetworkTechnology();
mBundle.putStringArray(CarrierConfigManager.KEY_CARRIER_METERED_APN_TYPES_STRINGS,
new String[]{PhoneConstants.APN_TYPE_DEFAULT});
@@ -1224,7 +1224,7 @@
//data rat change from ehrpd to lte
logd("Sending EVENT_DATA_RAT_CHANGED");
- doReturn(TelephonyManager.NETWORK_TYPE_LTE).when(mNetworkRegistrationState)
+ doReturn(TelephonyManager.NETWORK_TYPE_LTE).when(mNetworkRegistrationInfo)
.getAccessNetworkTechnology();
mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_DATA_RAT_CHANGED, null));
waitForMs(200);
@@ -1317,7 +1317,7 @@
@Test
@SmallTest
public void testDataRatChangeOOS() throws Exception {
- doReturn(TelephonyManager.NETWORK_TYPE_EHRPD).when(mNetworkRegistrationState)
+ doReturn(TelephonyManager.NETWORK_TYPE_EHRPD).when(mNetworkRegistrationInfo)
.getAccessNetworkTechnology();
mBundle.putStringArray(CarrierConfigManager.KEY_CARRIER_METERED_APN_TYPES_STRINGS,
new String[]{PhoneConstants.APN_TYPE_DEFAULT});
@@ -1343,7 +1343,7 @@
// Data rat change from ehrpd to unknown due to OOS
logd("Sending EVENT_DATA_RAT_CHANGED");
- doReturn(TelephonyManager.NETWORK_TYPE_UNKNOWN).when(mNetworkRegistrationState)
+ doReturn(TelephonyManager.NETWORK_TYPE_UNKNOWN).when(mNetworkRegistrationInfo)
.getAccessNetworkTechnology();
mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_DATA_RAT_CHANGED, null));
waitForMs(200);
@@ -1354,7 +1354,7 @@
any(Message.class));
// Data rat resume from unknown to ehrpd
- doReturn(TelephonyManager.NETWORK_TYPE_EHRPD).when(mNetworkRegistrationState)
+ doReturn(TelephonyManager.NETWORK_TYPE_EHRPD).when(mNetworkRegistrationInfo)
.getAccessNetworkTechnology();
mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_DATA_RAT_CHANGED, null));
waitForMs(200);
