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

Merge change I66ff8af6 into eclair-mr2

Browse Source 
* changes:
  Move calc of EriIconIndex/Mode to whenever basis changes
This commit is contained in:
Android (Google) Code Review
2009-10-21 20:45:37 -04:00
parent a86f1ccca0 cc5c1ad53c
commit 98a7c45416
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
View File

@@ -257,12 +257,6 @@ public class CDMAPhone extends PhoneBase {
} }
public ServiceState getServiceState() { public ServiceState getServiceState() {
int roamInd = mSST.ss.getCdmaRoamingIndicator();
int defRoamInd = mSST.ss.getCdmaDefaultRoamingIndicator();
mSST.ss.setCdmaEriIconIndex(mEriManager.getCdmaEriIconIndex(roamInd, defRoamInd));
mSST.ss.setCdmaEriIconMode(mEriManager.getCdmaEriIconMode(roamInd, defRoamInd));
return mSST.ss; return mSST.ss;
} }
@@ -804,10 +798,6 @@ public class CDMAPhone extends PhoneBase {
} }
void notifyServiceStateChanged(ServiceState ss) { void notifyServiceStateChanged(ServiceState ss) {
// TODO this seems really inefficient. Can't we calc this when the fundamentals change and store in the
// service state?
ss.setCdmaEriIconIndex(this.getCdmaEriIconIndex());
ss.setCdmaEriIconMode(this.getCdmaEriIconMode());
super.notifyServiceStateChangedP(ss); super.notifyServiceStateChangedP(ss);
} }
@@ -1330,9 +1320,7 @@ public class CDMAPhone extends PhoneBase {
@Override @Override
public int getCdmaEriIconIndex() { public int getCdmaEriIconIndex() {
int roamInd = getServiceState().getCdmaRoamingIndicator(); return getServiceState().getCdmaEriIconIndex();
int defRoamInd = getServiceState().getCdmaDefaultRoamingIndicator();
return mEriManager.getCdmaEriIconIndex(roamInd, defRoamInd);
} }
/** /**
@@ -1342,9 +1330,7 @@ public class CDMAPhone extends PhoneBase {
*/ */
@Override @Override
public int getCdmaEriIconMode() { public int getCdmaEriIconMode() {
int roamInd = getServiceState().getCdmaRoamingIndicator(); return getServiceState().getCdmaEriIconMode();
int defRoamInd = getServiceState().getCdmaDefaultRoamingIndicator();
return mEriManager.getCdmaEriIconMode(roamInd, defRoamInd);
} }
/** /**

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

@@ -782,6 +782,12 @@ final class CdmaServiceStateTracker extends ServiceStateTracker {
} }
} }
int roamingIndicator = newSS.getCdmaRoamingIndicator();
newSS.setCdmaEriIconIndex(phone.mEriManager.getCdmaEriIconIndex(roamingIndicator,
mDefaultRoamingIndicator));
newSS.setCdmaEriIconMode(phone.mEriManager.getCdmaEriIconMode(roamingIndicator,
mDefaultRoamingIndicator));
// NOTE: Some operator may require overriding mCdmaRoaming // NOTE: Some operator may require overriding mCdmaRoaming
// (set by the modem), depending on the mRoamingIndicator. // (set by the modem), depending on the mRoamingIndicator.