Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 82c1a5de: Merge "Revert "CDMALTE: Get roaming status based on SID/NID"" into honeycomb-LTE

Browse Source 
* commit '82c1a5dea305d56eb77efa7d9a730307ff6af28a':
  Revert "CDMALTE: Get roaming status based on SID/NID"
This commit is contained in:
Wink Saville
2011-06-14 14:47:04 -07:00
committed by Android Git Automerger
parent 9ee3975883 82c1a5dea3
commit 46cd4a4bfe
2 changed files with 5 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
View File

@@ -125,6 +125,8 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
} }
} }
// Not sure if this is needed in CDMALTE phone.
// mDataRoaming = regCodeIsRoaming(regState);
mLteSS.setRadioTechnology(type); mLteSS.setRadioTechnology(type);
mLteSS.setState(regCodeToServiceState(regState)); mLteSS.setState(regCodeToServiceState(regState));
} else { } else {
@@ -210,12 +212,6 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
if (DBG) log("pollStateDone: oldSS=[" + ss + "] newSS=[" + newSS + "]"); if (DBG) log("pollStateDone: oldSS=[" + ss + "] newSS=[" + newSS + "]");
if (cm.getSimState().isSIMReady()) {
// If CSIM is used, check roaming status according to SID/NID
// on EFcdmahome record.
newSS.setRoaming(!isInHomeSidNid(newSS.getSystemId(), newSS.getNetworkId()));
}
boolean hasRegistered = ss.getState() != ServiceState.STATE_IN_SERVICE boolean hasRegistered = ss.getState() != ServiceState.STATE_IN_SERVICE
&& newSS.getState() == ServiceState.STATE_IN_SERVICE; && newSS.getState() == ServiceState.STATE_IN_SERVICE;
@@ -468,33 +464,6 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
return provisioningState; return provisioningState;
} }
/**
* Check whether the specified SID and NID pair appears in the HOME SID/NID list
* read from NV or SIM.
*
* @return true if provided sid/nid pair belongs to operator's home network.
*/
private boolean isInHomeSidNid(int sid, int nid) {
// if SID/NID is not available, do not declare roaming.
if (isSidsAllZeros()) return true;
// length of SID/NID shold be same
if (mHomeSystemId.length != mHomeNetworkId.length) return true;
if (sid == 0) return true;
for (int i = 0; i < mHomeSystemId.length; i++) {
// Use SID only if NID is a reserved value.
// SID 0 and NID 0 and 65535 are reserved. (C.0005 2.6.5.2)
if ((mHomeSystemId[i] == sid) &&
((mHomeNetworkId[i] == 0) || (mHomeNetworkId[i] == 65535) ||
(nid == 0) || (nid == 65535) || (mHomeNetworkId[i] == nid))) {
return true;
}
}
return false;
}
@Override @Override
protected void log(String s) { protected void log(String s) {
Log.d(LOG_TAG, "[CdmaLteSST] " + s); Log.d(LOG_TAG, "[CdmaLteSST] " + s);

6
telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
View File

@@ -130,8 +130,8 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
private String curPlmn = null; private String curPlmn = null;
protected String mMdn; protected String mMdn;
protected int mHomeSystemId[] = null; private int mHomeSystemId[] = null;
protected int mHomeNetworkId[] = null; private int mHomeNetworkId[] = null;
protected String mMin; protected String mMin;
protected String mPrlVersion; protected String mPrlVersion;
protected boolean mIsMinInfoReady = false; protected boolean mIsMinInfoReady = false;
@@ -1481,7 +1481,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
} }
} }
protected boolean isSidsAllZeros() { private boolean isSidsAllZeros() {
if (mHomeSystemId != null) { if (mHomeSystemId != null) {
for (int i=0; i < mHomeSystemId.length; i++) { for (int i=0; i < mHomeSystemId.length; i++) {
if (mHomeSystemId[i] != 0) { if (mHomeSystemId[i] != 0) {