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

Merge change 3126 into donut

Browse Source 
* changes:
  Fix thread safety in DataConnectionTracker.
This commit is contained in:
Android (Google) Code Review
2009-06-04 10:09:59 -07:00
parent 320b2eeeea 9c2a3be8ba
commit 3d3e307a63
5 changed files with 63 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
telephony/java/com/android/internal/telephony/DataConnectionTracker.java
View File

@@ -93,6 +93,7 @@ public abstract class DataConnectionTracker extends Handler {
protected static final int EVENT_NV_READY = 31;
protected static final int EVENT_PS_RESTRICT_ENABLED = 32;
protected static final int EVENT_PS_RESTRICT_DISABLED = 33;
public static final int EVENT_CLEAN_UP_CONNECTION = 34;
//***** Constants
protected static final int RECONNECT_DELAY_INITIAL_MILLIS = 5 * 1000;
@@ -149,7 +150,7 @@ public abstract class DataConnectionTracker extends Handler {
/** Intent sent when the reconnect alarm fires. */
protected PendingIntent mReconnectIntent = null;
/** CID of active data connection */
protected int cidActive;
@@ -226,6 +227,7 @@ public abstract class DataConnectionTracker extends Handler {
protected abstract void onDisconnectDone(AsyncResult ar);
protected abstract void onVoiceCallStarted();
protected abstract void onVoiceCallEnded();
protected abstract void onCleanUpConnection(boolean tearDown, String reason);
//***** Overridden from Handler
public void handleMessage (Message msg) {
@@ -272,18 +274,17 @@ public abstract class DataConnectionTracker extends Handler {
onVoiceCallEnded();
break;
case EVENT_CLEAN_UP_CONNECTION:
boolean tearDown = (msg.arg1 == 0) ? false : true;
onCleanUpConnection(tearDown, (String)msg.obj);
break;
default:
Log.e("DATA", "Unidentified event = " + msg.what);
break;
}
}
/**
* Simply tear down data connections due to radio off
* and don't setup again.
*/
public abstract void cleanConnectionBeforeRadioOff();
/**
* Report the current state of data connectivity (enabled or disabled)
* @return {@code false} if data connectivity has been explicitly disabled,

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

@@ -262,14 +262,6 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
Log.d(LOG_TAG, "dataEnabled[DEFAULT_PROFILE]=" + dataEnabled[EXTERNAL_NETWORK_DEFAULT_ID]);
}
/**
* Simply tear down data connections due to radio off
* and don't setup again.
*/
public void cleanConnectionBeforeRadioOff() {
cleanUpConnection(true, Phone.REASON_RADIO_TURNED_OFF);
}
/**
* The data connection is expected to be setup while device
* 1. has ruim card or non-volatile data store
@@ -821,6 +813,13 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
}
}
/**
* @override com.android.internal.telephony.DataConnectionTracker
*/
protected void onCleanUpConnection(boolean tearDown, String reason) {
cleanUpConnection(tearDown, reason);
}
private boolean tryAgain(FailCause cause) {
return (cause != FailCause.RADIO_NOT_AVAILABLE)
&& (cause != FailCause.RADIO_OFF)

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

@@ -449,7 +449,10 @@ final class CdmaServiceStateTracker extends ServiceStateTracker {
(dcTracker.getAnyDataEnabled() ? 1 : 0) );
EventLog.writeEvent(TelephonyEventLog.EVENT_LOG_DATA_STATE_RADIO_OFF, val);
}
dcTracker.cleanConnectionBeforeRadioOff();
Message msg = dcTracker.obtainMessage(DataConnectionTracker.EVENT_CLEAN_UP_CONNECTION);
msg.arg1 = 1; // tearDown is true
msg.obj = CDMAPhone.REASON_RADIO_TURNED_OFF;
sendMessage(msg);
// Poll data state up to 15 times, with a 100ms delay
// totaling 1.5 sec. Normal data disable action will finish in 100ms.
@@ -679,7 +682,7 @@ final class CdmaServiceStateTracker extends ServiceStateTracker {
newSS.setCdmaRoamingIndicator(EriInfo.ROAMING_INDICATOR_OFF);
} else {
// System is acquired, prl match, no nam match or mRoamingIndicator > 2
newSS.setCdmaRoamingIndicator(mRoamingIndicator);
newSS.setCdmaRoamingIndicator(mRoamingIndicator);
}
} else {
if (mRegistrationState == 5) {
@@ -688,8 +691,8 @@ final class CdmaServiceStateTracker extends ServiceStateTracker {
} else {
// Use the default indicator
}
}
}
newSS.setCdmaDefaultRoamingIndicator(mDefaultRoamingIndicator);
// NOTE: Some operator may require to override the mCdmaRoaming (set by the modem)

64
telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
View File

@@ -28,10 +28,9 @@ import android.content.SharedPreferences;
import android.database.ContentObserver;
import android.database.Cursor;
import android.net.NetworkInfo;
import android.net.wifi.WifiManager;
import android.net.Uri;
import android.net.wifi.WifiManager;
import android.os.AsyncResult;
import android.os.Handler;
import android.os.INetStatService;
import android.os.Message;
import android.os.RemoteException;
@@ -42,7 +41,6 @@ import android.preference.PreferenceManager;
import android.provider.Checkin;
import android.provider.Settings;
import android.provider.Telephony;
import android.provider.Settings.SettingNotFoundException;
import android.telephony.ServiceState;
import android.telephony.TelephonyManager;
import android.telephony.gsm.GsmCellLocation;
@@ -52,11 +50,10 @@ import android.util.Log;
import com.android.internal.telephony.DataCallState;
import com.android.internal.telephony.DataConnection;
import com.android.internal.telephony.DataConnection.FailCause;
import com.android.internal.telephony.DataConnectionTracker;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneProxy;
import com.android.internal.telephony.TelephonyEventLog;
import com.android.internal.telephony.DataConnection.FailCause;
import java.io.IOException;
import java.util.ArrayList;
@@ -177,9 +174,12 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
String reason = intent.getStringExtra(INTENT_RECONNECT_ALARM_EXTRA_REASON);
if (state == State.FAILED) {
cleanUpConnection(false, reason);
Message msg = obtainMessage(EVENT_CLEAN_UP_CONNECTION);
msg.arg1 = 0; // tearDown is false
msg.obj = (String) reason;
sendMessage(msg);
}
trySetupData(reason);
sendMessage(obtainMessage(EVENT_TRY_SETUP_DATA));
} else if (action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) {
final android.net.NetworkInfo networkInfo = (NetworkInfo)
intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO);
@@ -260,7 +260,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
((GSMPhone) phone).mSST.unregisterForRoamingOff(this);
((GSMPhone) phone).mSST.unregisterForPsRestrictedEnabled(this);
((GSMPhone) phone).mSST.unregisterForPsRestrictedDisabled(this);
phone.getContext().unregisterReceiver(this.mIntentReceiver);
phone.getContext().getContentResolver().unregisterContentObserver(this.apnObserver);
@@ -362,7 +362,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
* The APN of the specified type is no longer needed. Ensure that if
* use of the default APN has not been explicitly disabled, we are connected
* to the default APN.
* @param type the APN type. The only valid values are currently
* @param type the APN type. The only valid values are currently
* {@link Phone#APN_TYPE_MMS} and {@link Phone#APN_TYPE_SUPL}.
* @return
*/
@@ -410,7 +410,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
if (((GSMPhone) phone).mSIMRecords.getRecordsLoaded() &&
((GSMPhone) phone).mSST.getCurrentGprsState() == ServiceState.STATE_IN_SERVICE &&
(!roaming || getDataOnRoamingEnabled()) &&
!mIsWifiConnected &&
!mIsWifiConnected &&
!mIsPsRestricted ) {
return (state == State.CONNECTED);
}
@@ -494,14 +494,6 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
return true;
}
}
/**
* Simply tear down data connections due to radio off
* and don't setup again.
*/
public void cleanConnectionBeforeRadioOff() {
cleanUpConnection(true, Phone.REASON_RADIO_TURNED_OFF);
}
/**
* Report the current state of data connectivity (enabled or disabled) for
@@ -566,7 +558,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
if (DBG) log("***trySetupData due to " + (reason == null ? "(unspecified)" : reason));
Log.d(LOG_TAG, "[DSAC DEB] " + "trySetupData with mIsPsRestricted=" + mIsPsRestricted);
if (phone.getSimulatedRadioControl() != null) {
// Assume data is connected on the simulator
// FIXME this can be improved
@@ -664,7 +656,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
* IDLE before the code below runs. If we didn't check
* for that, future calls to trySetupData would fail,
* and we would never get out of the DISCONNECTING state.
*/
*/
if (!tearDown) {
setState(State.IDLE);
phone.notifyDataConnection(reason);
@@ -1061,7 +1053,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
}
int watchdogTrigger = Settings.Gservices.getInt(mResolver,
Settings.Gservices.PDP_WATCHDOG_TRIGGER_PACKET_COUNT,
Settings.Gservices.PDP_WATCHDOG_TRIGGER_PACKET_COUNT,
NUMBER_SENT_PACKETS_OF_HANG);
if (sentSinceLastRecv >= watchdogTrigger) {
@@ -1084,7 +1076,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
// Slow down the poll interval to let things happen
netStatPollPeriod = Settings.Gservices.getInt(mResolver,
Settings.Gservices.PDP_WATCHDOG_ERROR_POLL_INTERVAL_MS,
Settings.Gservices.PDP_WATCHDOG_ERROR_POLL_INTERVAL_MS,
POLL_NETSTAT_SLOW_MILLIS);
} else {
if (DBG) log("Sent " + String.valueOf(sentSinceLastRecv) +
@@ -1117,7 +1109,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
}
}
};
private void runPingTest () {
int status = -1;
try {
@@ -1166,19 +1158,19 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
/**
* Return true if data connection need to be setup after disconnected due to
* reason.
*
*
* @param reason the reason why data is disconnected
* @return true if try setup data connection is need for this reason
* @return true if try setup data connection is need for this reason
*/
private boolean retryAfterDisconnected(String reason) {
boolean retry = true;
if ( Phone.REASON_RADIO_TURNED_OFF.equals(reason) ||
Phone.REASON_DATA_DISABLED.equals(reason) ) {
Phone.REASON_DATA_DISABLED.equals(reason) ) {
retry = false;
}
return retry;
}
}
private void reconnectAfterFail(FailCause lastFailCauseCode, String reason) {
if (state == State.FAILED) {
@@ -1331,7 +1323,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
cause = (PdpConnection.FailCause) (ar.result);
if(DBG) log("PDP setup failed " + cause);
// Log this failure to the Event Logs.
if (cause == PdpConnection.FailCause.BAD_APN ||
if (cause == PdpConnection.FailCause.BAD_APN ||
cause == PdpConnection.FailCause.BAD_PAP_SECRET ||
cause == PdpConnection.FailCause.BARRED ||
cause == PdpConnection.FailCause.RADIO_ERROR_RETRY ||
@@ -1343,7 +1335,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
if (loc != null) cid = loc.getCid();
EventLog.List val = new EventLog.List(
cause.ordinal(), cid,
cause.ordinal(), cid,
TelephonyManager.getDefault().getNetworkType());
EventLog.writeEvent(TelephonyEventLog.EVENT_LOG_RADIO_PDP_SETUP_FAIL, val);
}
@@ -1416,6 +1408,10 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
}
}
protected void onCleanUpConnection(boolean tearDown, String reason) {
cleanUpConnection(tearDown, reason);
}
private boolean tryNextApn(FailCause cause) {
return (cause != FailCause.RADIO_NOT_AVAILABLE)
&& (cause != FailCause.RADIO_OFF)
@@ -1576,7 +1572,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
ContentResolver resolver = phone.getContext().getContentResolver();
resolver.delete(PREFERAPN_URI, null, null);
if (pos >= 0) {
if (pos >= 0) {
ContentValues values = new ContentValues();
values.put(APN_ID, pos);
resolver.insert(PREFERAPN_URI, values);
@@ -1589,7 +1585,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
}
Cursor cursor = phone.getContext().getContentResolver().query(
PREFERAPN_URI, new String[] { "_id", "name", "apn" },
PREFERAPN_URI, new String[] { "_id", "name", "apn" },
null, null, Telephony.Carriers.DEFAULT_SORT_ORDER);
if (cursor != null) {
@@ -1673,9 +1669,9 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
* PDP context and notify us with PDP_CONTEXT_CHANGED.
* But we should stop the network polling and prevent reset PDP.
*/
Log.d(LOG_TAG, "[DSAC DEB] " + "EVENT_PS_RESTRICT_ENABLED " + mIsPsRestricted);
Log.d(LOG_TAG, "[DSAC DEB] " + "EVENT_PS_RESTRICT_ENABLED " + mIsPsRestricted);
stopNetStatPoll();
mIsPsRestricted = true;
mIsPsRestricted = true;
break;
case EVENT_PS_RESTRICT_DISABLED:

23
telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
View File

@@ -16,7 +16,13 @@
package com.android.internal.telephony.gsm;
import com.android.internal.telephony.Phone;
import static com.android.internal.telephony.TelephonyProperties.PROPERTY_DATA_NETWORK_TYPE;
import static com.android.internal.telephony.TelephonyProperties.PROPERTY_ICC_OPERATOR_ALPHA;
import static com.android.internal.telephony.TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC;
import static com.android.internal.telephony.TelephonyProperties.PROPERTY_OPERATOR_ALPHA;
import static com.android.internal.telephony.TelephonyProperties.PROPERTY_OPERATOR_ISO_COUNTRY;
import static com.android.internal.telephony.TelephonyProperties.PROPERTY_OPERATOR_ISROAMING;
import static com.android.internal.telephony.TelephonyProperties.PROPERTY_OPERATOR_NUMERIC;
import android.app.AlarmManager;
import android.app.Notification;
import android.app.NotificationManager;
@@ -50,21 +56,11 @@ import com.android.internal.telephony.CommandException;
import com.android.internal.telephony.CommandsInterface;
import com.android.internal.telephony.DataConnectionTracker;
import com.android.internal.telephony.IccCard;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneProxy;
import com.android.internal.telephony.RILConstants;
import com.android.internal.telephony.ServiceStateTracker;
import com.android.internal.telephony.TelephonyEventLog;
import com.android.internal.telephony.TelephonyIntents;
import static com.android.internal.telephony.TelephonyProperties.PROPERTY_DATA_NETWORK_TYPE;
import static com.android.internal.telephony.TelephonyProperties.PROPERTY_ICC_OPERATOR_ALPHA;
import static com.android.internal.telephony.TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC;
import static com.android.internal.telephony.TelephonyProperties.PROPERTY_OPERATOR_ALPHA;
import static com.android.internal.telephony.TelephonyProperties.PROPERTY_OPERATOR_ISO_COUNTRY;
import static com.android.internal.telephony.TelephonyProperties.PROPERTY_OPERATOR_ISROAMING;
import static com.android.internal.telephony.TelephonyProperties.PROPERTY_OPERATOR_NUMERIC;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
@@ -541,7 +537,10 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
(dcTracker.getAnyDataEnabled() ? 1 : 0) );
EventLog.writeEvent(TelephonyEventLog.EVENT_LOG_DATA_STATE_RADIO_OFF, val);
}
dcTracker.cleanConnectionBeforeRadioOff();
Message msg = dcTracker.obtainMessage(DataConnectionTracker.EVENT_CLEAN_UP_CONNECTION);
msg.arg1 = 1; // tearDown is true
msg.obj = GSMPhone.REASON_RADIO_TURNED_OFF;
sendMessage(msg);
// poll data state up to 15 times, with a 100ms delay
// totaling 1.5 sec. Normal data disable action will finish in 100ms.