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

Merge change 415 into donut

Browse Source 
* changes:
  code cleanup
This commit is contained in:
Android (Google) Code Review
2009-04-24 00:39:44 -07:00
parent 5fa153302c 39bae34694
commit dcac00d4d2
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
View File

@@ -64,7 +64,7 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
private static final String LOG_TAG = "CDMA"; private static final String LOG_TAG = "CDMA";
private static final boolean DBG = true; private static final boolean DBG = true;
//***** Instance Variables private CDMAPhone mCdmaPhone;
// Indicates baseband will not auto-attach // Indicates baseband will not auto-attach
private boolean noAutoAttach = false; private boolean noAutoAttach = false;
@@ -83,20 +83,19 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
private CdmaDataConnection mActiveDataConnection; private CdmaDataConnection mActiveDataConnection;
/** Defined cdma connection profiles */ /** Defined cdma connection profiles */
private static int EXTERNAL_NETWORK_DEFAULT_ID = 0; private static final int EXTERNAL_NETWORK_DEFAULT_ID = 0;
private static int EXTERNAL_NETWORK_NUM_TYPES = 1; private static final int EXTERNAL_NETWORK_NUM_TYPES = 1;
private boolean[] dataEnabled = new boolean[EXTERNAL_NETWORK_NUM_TYPES]; private boolean[] dataEnabled = new boolean[EXTERNAL_NETWORK_NUM_TYPES];
//***** Constants
/** /**
* Pool size of CdmaDataConnection objects. * Pool size of CdmaDataConnection objects.
*/ */
private static final int DATA_CONNECTION_POOL_SIZE = 1; private static final int DATA_CONNECTION_POOL_SIZE = 1;
private static final int POLL_CONNECTION_MILLIS = 5 * 1000; private static final int POLL_CONNECTION_MILLIS = 5 * 1000;
private static final String INTENT_RECONNECT_ALARM = "com.android.internal.telephony.cdma-reconnect"; private static final String INTENT_RECONNECT_ALARM =
"com.android.internal.telephony.cdma-reconnect";
private static final String INTENT_RECONNECT_ALARM_EXTRA_REASON = "reason"; private static final String INTENT_RECONNECT_ALARM_EXTRA_REASON = "reason";
// Possibly promoate to base class, the only difference is // Possibly promoate to base class, the only difference is
@@ -146,6 +145,7 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
CdmaDataConnectionTracker(CDMAPhone p) { CdmaDataConnectionTracker(CDMAPhone p) {
super(p); super(p);
mCdmaPhone = p;
p.mCM.registerForAvailable (this, EVENT_RADIO_AVAILABLE, null); p.mCM.registerForAvailable (this, EVENT_RADIO_AVAILABLE, null);
p.mCM.registerForOffOrNotAvailable(this, EVENT_RADIO_OFF_OR_NOT_AVAILABLE, null); p.mCM.registerForOffOrNotAvailable(this, EVENT_RADIO_OFF_OR_NOT_AVAILABLE, null);
@@ -187,15 +187,15 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
//Unregister from all events //Unregister from all events
phone.mCM.unregisterForAvailable(this); phone.mCM.unregisterForAvailable(this);
phone.mCM.unregisterForOffOrNotAvailable(this); phone.mCM.unregisterForOffOrNotAvailable(this);
((CDMAPhone) phone).mRuimRecords.unregisterForRecordsLoaded(this); mCdmaPhone.mRuimRecords.unregisterForRecordsLoaded(this);
phone.mCM.unregisterForNVReady(this); phone.mCM.unregisterForNVReady(this);
phone.mCM.unregisterForDataStateChanged(this); phone.mCM.unregisterForDataStateChanged(this);
((CDMAPhone) phone).mCT.unregisterForVoiceCallEnded(this); mCdmaPhone.mCT.unregisterForVoiceCallEnded(this);
((CDMAPhone) phone).mCT.unregisterForVoiceCallStarted(this); mCdmaPhone.mCT.unregisterForVoiceCallStarted(this);
((CDMAPhone) phone).mSST.unregisterForCdmaDataConnectionAttached(this); mCdmaPhone.mSST.unregisterForCdmaDataConnectionAttached(this);
((CDMAPhone) phone).mSST.unregisterForCdmaDataConnectionDetached(this); mCdmaPhone.mSST.unregisterForCdmaDataConnectionDetached(this);
((CDMAPhone) phone).mSST.unregisterForRoamingOn(this); mCdmaPhone.mSST.unregisterForRoamingOn(this);
((CDMAPhone) phone).mSST.unregisterForRoamingOff(this); mCdmaPhone.mSST.unregisterForRoamingOff(this);
phone.getContext().unregisterReceiver(this.mIntentReceiver); phone.getContext().unregisterReceiver(this.mIntentReceiver);
destroyAllDataConnectionList(); destroyAllDataConnectionList();
@@ -277,10 +277,10 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
public boolean isDataConnectionAsDesired() { public boolean isDataConnectionAsDesired() {
boolean roaming = phone.getServiceState().getRoaming(); boolean roaming = phone.getServiceState().getRoaming();
if ( ((phone.mCM.getRadioState() == CommandsInterface.RadioState.NV_READY) || if (((phone.mCM.getRadioState() == CommandsInterface.RadioState.NV_READY) ||
((CDMAPhone) phone).mRuimRecords.getRecordsLoaded()) && mCdmaPhone.mRuimRecords.getRecordsLoaded()) &&
((CDMAPhone) phone).mSST.getCurrentCdmaDataConnectionState() == (mCdmaPhone.mSST.getCurrentCdmaDataConnectionState() ==
ServiceState.STATE_IN_SERVICE && ServiceState.STATE_IN_SERVICE) &&
(!roaming || getDataOnRoamingEnabled()) && (!roaming || getDataOnRoamingEnabled()) &&
!mIsWifiConnected ) { !mIsWifiConnected ) {
return (state == State.CONNECTED); return (state == State.CONNECTED);
@@ -353,7 +353,7 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
return true; return true;
} }
int psState = ((CDMAPhone) phone).mSST.getCurrentCdmaDataConnectionState(); int psState = mCdmaPhone.mSST.getCurrentCdmaDataConnectionState();
boolean roaming = phone.getServiceState().getRoaming(); boolean roaming = phone.getServiceState().getRoaming();
if ((state == State.IDLE || state == State.SCANNING) if ((state == State.IDLE || state == State.SCANNING)
@@ -361,9 +361,9 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
psState == ServiceState.RADIO_TECHNOLOGY_EVDO_0 || psState == ServiceState.RADIO_TECHNOLOGY_EVDO_0 ||
psState == ServiceState.RADIO_TECHNOLOGY_EVDO_A) psState == ServiceState.RADIO_TECHNOLOGY_EVDO_A)
&& ((phone.mCM.getRadioState() == CommandsInterface.RadioState.NV_READY) || && ((phone.mCM.getRadioState() == CommandsInterface.RadioState.NV_READY) ||
((CDMAPhone) phone).mRuimRecords.getRecordsLoaded()) mCdmaPhone.mRuimRecords.getRecordsLoaded())
&& (((CDMAPhone) phone).mSST.isConcurrentVoiceAndData() || && (mCdmaPhone.mSST.isConcurrentVoiceAndData() ||
phone.getState() == Phone.State.IDLE ) phone.getState() == Phone.State.IDLE )
&& isDataAllowed()) { && isDataAllowed()) {
return setupData(reason); return setupData(reason);
@@ -374,8 +374,8 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
" dataState=" + state + " dataState=" + state +
" PS state=" + psState + " PS state=" + psState +
" radio state=" + phone.mCM.getRadioState() + " radio state=" + phone.mCM.getRadioState() +
" ruim=" + ((CDMAPhone) phone).mRuimRecords.getRecordsLoaded() + " ruim=" + mCdmaPhone.mRuimRecords.getRecordsLoaded() +
" concurrentVoice&Data=" + ((CDMAPhone) phone).mSST.isConcurrentVoiceAndData() + " concurrentVoice&Data=" + mCdmaPhone.mSST.isConcurrentVoiceAndData() +
" phoneState=" + phone.getState() + " phoneState=" + phone.getState() +
" dataEnabled=" + getAnyDataEnabled() + " dataEnabled=" + getAnyDataEnabled() +
" roaming=" + roaming + " roaming=" + roaming +
@@ -781,7 +781,7 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
* @override com.android.internal.telephony.DataConnectionTracker * @override com.android.internal.telephony.DataConnectionTracker
*/ */
protected void onVoiceCallStarted() { protected void onVoiceCallStarted() {
if (state == State.CONNECTED && !((CDMAPhone) phone).mSST.isConcurrentVoiceAndData()) { if (state == State.CONNECTED && !mCdmaPhone.mSST.isConcurrentVoiceAndData()) {
stopNetStatPoll(); stopNetStatPoll();
phone.notifyDataConnection(Phone.REASON_VOICE_CALL_STARTED); phone.notifyDataConnection(Phone.REASON_VOICE_CALL_STARTED);
} }
@@ -792,7 +792,7 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
*/ */
protected void onVoiceCallEnded() { protected void onVoiceCallEnded() {
if (state == State.CONNECTED) { if (state == State.CONNECTED) {
if (!((CDMAPhone) phone).mSST.isConcurrentVoiceAndData()) { if (!mCdmaPhone.mSST.isConcurrentVoiceAndData()) {
startNetStatPoll(); startNetStatPoll();
phone.notifyDataConnection(Phone.REASON_VOICE_CALL_ENDED); phone.notifyDataConnection(Phone.REASON_VOICE_CALL_ENDED);
} else { } else {
@@ -818,7 +818,7 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
CdmaDataConnection dataConn; CdmaDataConnection dataConn;
for (int i = 0; i < DATA_CONNECTION_POOL_SIZE; i++) { for (int i = 0; i < DATA_CONNECTION_POOL_SIZE; i++) {
dataConn = new CdmaDataConnection(((CDMAPhone) phone)); dataConn = new CdmaDataConnection(mCdmaPhone);
dataConnectionList.add(dataConn); dataConnectionList.add(dataConn);
} }
} }